From 29175058c12eb71151c11850aed803d90420d7b6 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 12:56:58 +0100 Subject: [PATCH 01/29] Use relative paths in packages/react --- packages/react/src/React.js | 14 +++++++------- packages/react/src/ReactBaseClasses.js | 4 ++-- packages/react/src/ReactChildren.js | 2 +- packages/react/src/ReactElement.js | 2 +- packages/react/src/ReactElementValidator.js | 12 ++++++------ packages/react/src/onlyChild.js | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/react/src/React.js b/packages/react/src/React.js index d67fdd8540e0..4b26fd6e7f37 100644 --- a/packages/react/src/React.js +++ b/packages/react/src/React.js @@ -7,19 +7,19 @@ 'use strict'; -var ReactBaseClasses = require('ReactBaseClasses'); -var ReactChildren = require('ReactChildren'); -var ReactElement = require('ReactElement'); -var ReactVersion = require('ReactVersion'); +var ReactBaseClasses = require('./class/ReactBaseClasses'); +var ReactChildren = require('./children/ReactChildren'); +var ReactElement = require('./element/ReactElement'); +var ReactVersion = require('shared/ReactVersion'); -var onlyChild = require('onlyChild'); +var onlyChild = require('./children/onlyChild'); var createElement = ReactElement.createElement; var createFactory = ReactElement.createFactory; var cloneElement = ReactElement.cloneElement; if (__DEV__) { - var ReactElementValidator = require('ReactElementValidator'); + var ReactElementValidator = require('./element/ReactElementValidator'); createElement = ReactElementValidator.createElement; createFactory = ReactElementValidator.createFactory; cloneElement = ReactElementValidator.cloneElement; @@ -56,7 +56,7 @@ var React = { if (__DEV__) { Object.assign(React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, { // These should not be included in production. - ReactDebugCurrentFrame: require('ReactDebugCurrentFrame'), + ReactDebugCurrentFrame: require('./element/ReactDebugCurrentFrame'), }); } diff --git a/packages/react/src/ReactBaseClasses.js b/packages/react/src/ReactBaseClasses.js index 5c7c08212516..35f6443d10bd 100644 --- a/packages/react/src/ReactBaseClasses.js +++ b/packages/react/src/ReactBaseClasses.js @@ -9,11 +9,11 @@ 'use strict'; -var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue'); +var ReactNoopUpdateQueue = require('./ReactNoopUpdateQueue'); var emptyObject = require('fbjs/lib/emptyObject'); var invariant = require('fbjs/lib/invariant'); -var lowPriorityWarning = require('lowPriorityWarning'); +var lowPriorityWarning = require('shared/lowPriorityWarning'); /** * 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 3d4d3e19e75f..99af9ef79764 100644 --- a/packages/react/src/ReactChildren.js +++ b/packages/react/src/ReactChildren.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactElement = require('ReactElement'); +var ReactElement = require('../element/ReactElement'); var emptyFunction = require('fbjs/lib/emptyFunction'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/react/src/ReactElement.js b/packages/react/src/ReactElement.js index f1d20fdf08ff..ea7b4ad081a5 100644 --- a/packages/react/src/ReactElement.js +++ b/packages/react/src/ReactElement.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactCurrentOwner = require('ReactCurrentOwner'); +var ReactCurrentOwner = require('./ReactCurrentOwner'); var hasOwnProperty = Object.prototype.hasOwnProperty; if (__DEV__) { diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js index 2c0a2271a10b..544ddfea3e71 100644 --- a/packages/react/src/ReactElementValidator.js +++ b/packages/react/src/ReactElementValidator.js @@ -16,16 +16,16 @@ 'use strict'; -var ReactCurrentOwner = require('ReactCurrentOwner'); -var ReactElement = require('ReactElement'); +var ReactCurrentOwner = require('./ReactCurrentOwner'); +var ReactElement = require('./ReactElement'); if (__DEV__) { + var ReactDebugCurrentFrame = require('./ReactDebugCurrentFrame'); var checkPropTypes = require('prop-types/checkPropTypes'); - var lowPriorityWarning = require('lowPriorityWarning'); - var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame'); + var lowPriorityWarning = require('shared/lowPriorityWarning'); var warning = require('fbjs/lib/warning'); - var describeComponentFrame = require('describeComponentFrame'); - var getComponentName = require('getComponentName'); + var describeComponentFrame = require('shared/describeComponentFrame'); + var getComponentName = require('shared/getComponentName'); var currentlyValidatingElement = null; diff --git a/packages/react/src/onlyChild.js b/packages/react/src/onlyChild.js index 590825c4a749..bfa2fb598c5d 100644 --- a/packages/react/src/onlyChild.js +++ b/packages/react/src/onlyChild.js @@ -8,7 +8,7 @@ */ 'use strict'; -var ReactElement = require('ReactElement'); +var ReactElement = require('../element/ReactElement'); var invariant = require('fbjs/lib/invariant'); From ecc8061d6275152207fd3cfad9c58fdd11b2fd89 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 12:57:27 +0100 Subject: [PATCH 02/29] Use relative paths in packages/react-art --- packages/react-art/src/ReactART.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js index 5676ab8f8d05..de404bb52146 100644 --- a/packages/react-art/src/ReactART.js +++ b/packages/react-art/src/ReactART.js @@ -18,7 +18,7 @@ const invariant = require('fbjs/lib/invariant'); const emptyObject = require('fbjs/lib/emptyObject'); const React = require('react'); const ReactFiberReconciler = require('react-reconciler'); -const ReactDOMFrameScheduling = require('ReactDOMFrameScheduling'); +const ReactDOMFrameScheduling = require('shared/ReactDOMFrameScheduling'); const {Component} = React; From 3b5d96226995adccc90e564e360b890d48b39fc8 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 13:00:16 +0100 Subject: [PATCH 03/29] Use relative paths in packages/react-cs --- packages/react-cs-renderer/src/ReactNativeCS.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/react-cs-renderer/src/ReactNativeCS.js b/packages/react-cs-renderer/src/ReactNativeCS.js index 1706031295f8..9e5d8ecb997b 100644 --- a/packages/react-cs-renderer/src/ReactNativeCS.js +++ b/packages/react-cs-renderer/src/ReactNativeCS.js @@ -9,10 +9,11 @@ 'use strict'; -const ReactGenericBatching = require('ReactGenericBatching'); -const ReactVersion = require('ReactVersion'); +const ReactGenericBatching = require('shared/event/ReactGenericBatching'); +const ReactVersion = require('shared/ReactVersion'); -const {injectInternals} = require('ReactFiberDevToolsHook'); +// TODO: export or move to shared. +const {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); import type {ReactNativeCSType} from 'ReactNativeCSTypes'; From c3f23f493e616c3da0a7be976e225a5caaf979fd Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 17:55:03 +0100 Subject: [PATCH 04/29] Use relative paths in other packages --- packages/events/EventPluginHub.js | 10 ++-- packages/events/EventPluginUtils.js | 2 +- packages/events/EventPropagators.js | 8 ++-- packages/events/ReactControlledComponent.js | 2 +- packages/events/ReactEventEmitterMixin.js | 2 +- packages/events/ReactGenericBatching.js | 2 +- packages/events/ResponderEventPlugin.js | 12 ++--- packages/events/ResponderSyntheticEvent.js | 2 +- packages/events/ResponderTouchHistoryStore.js | 2 +- .../__tests__/EventPluginRegistry-test.js | 2 +- .../__tests__/ResponderEventPlugin-test.js | 2 +- .../events/__tests__/accumulateInto-test.js | 2 +- .../react-cs-renderer/src/ReactNativeCS.js | 2 +- packages/react-dom/index.fb.js | 19 ++++---- .../ReactBrowserEventEmitter-test.js | 10 ++-- .../src/__tests__/ReactDOMComponent-test.js | 2 +- .../__tests__/ReactDOMComponentTree-test.js | 2 +- .../__tests__/ReactDOMEventListener-test.js | 4 +- .../src/__tests__/ReactDOMFiberAsync-test.js | 13 +++++- .../src/__tests__/ReactDOMSelection-test.js | 4 +- .../ReactDOMServerIntegration-test.js | 2 +- .../__tests__/ReactServerRendering-test.js | 2 +- .../src/__tests__/ReactTreeTraversal-test.js | 2 +- .../escapeTextContentForBrowser-test.js | 2 +- .../src/__tests__/inputValueTracking-test.js | 2 +- .../quoteAttributeValueForBrowser-test.js | 2 +- .../src/__tests__/validateDOMNesting-test.js | 2 +- .../src/client/DOMPropertyOperations.js | 2 +- packages/react-dom/src/client/ReactDOM.js | 34 +++++++------- .../src/client/ReactDOMClientInjection.js | 22 ++++----- .../src/client/ReactDOMFiberComponent.js | 46 ++++++++++--------- .../src/client/ReactDOMFiberInput.js | 13 ++++-- .../src/client/ReactDOMFiberSelect.js | 7 +-- .../src/client/ReactDOMFiberTextarea.js | 5 +- .../react-dom/src/client/ReactDOMSelection.js | 6 +-- .../src/client/ReactInputSelection.js | 4 +- .../getNodeForCharacterOffset-test.js | 2 +- .../src/client/__tests__/setInnerHTML-test.js | 4 +- .../src/client/getNodeForCharacterOffset.js | 2 +- packages/react-dom/src/client/setInnerHTML.js | 4 +- .../react-dom/src/client/setTextContent.js | 6 +-- .../src/client/validateDOMNesting.js | 3 +- .../src/events/BeforeInputEventPlugin.js | 8 ++-- .../src/events/BrowserEventConstants.js | 2 +- .../react-dom/src/events/ChangeEventPlugin.js | 22 ++++----- .../src/events/EnterLeaveEventPlugin.js | 6 +-- .../src/events/FallbackCompositionState.js | 2 +- .../src/events/ReactBrowserEventEmitter.js | 10 ++-- .../src/events/ReactDOMEventListener.js | 10 ++-- .../react-dom/src/events/SelectEventPlugin.js | 14 +++--- .../react-dom/src/events/SimpleEventPlugin.js | 26 +++++------ .../src/events/SyntheticAnimationEvent.js | 2 +- .../src/events/SyntheticClipboardEvent.js | 2 +- .../src/events/SyntheticCompositionEvent.js | 2 +- .../src/events/SyntheticDragEvent.js | 2 +- .../src/events/SyntheticFocusEvent.js | 2 +- .../src/events/SyntheticInputEvent.js | 2 +- .../src/events/SyntheticKeyboardEvent.js | 8 ++-- .../src/events/SyntheticMouseEvent.js | 4 +- .../src/events/SyntheticTouchEvent.js | 4 +- .../src/events/SyntheticTransitionEvent.js | 2 +- .../react-dom/src/events/SyntheticUIEvent.js | 2 +- .../src/events/SyntheticWheelEvent.js | 2 +- .../react-dom/src/events/TapEventPlugin.js | 6 +-- .../__tests__/BeforeInputEventPlugin-test.js | 8 ++-- .../__tests__/ChangeEventPlugin-test.js | 4 +- .../__tests__/EnterLeaveEventPlugin-test.js | 4 +- .../FallbackCompositionState-test.js | 2 +- .../__tests__/SelectEventPlugin-test.js | 4 +- .../__tests__/SyntheticClipboardEvent-test.js | 4 +- .../events/__tests__/SyntheticEvent-test.js | 4 +- .../__tests__/SyntheticKeyboardEvent-test.js | 8 ++-- .../__tests__/SyntheticWheelEvent-test.js | 4 +- .../events/__tests__/getEventCharCode-test.js | 2 +- .../src/events/__tests__/getEventKey-test.js | 2 +- packages/react-dom/src/events/getEventKey.js | 2 +- .../react-dom/src/events/getEventTarget.js | 2 +- .../src/server/DOMMarkupOperations.js | 4 +- .../src/server/ReactDOMNodeStreamRenderer.js | 2 +- .../src/server/ReactDOMServerBrowser.js | 6 +-- .../src/server/ReactDOMServerNode.js | 8 ++-- .../src/server/ReactDOMStringRenderer.js | 2 +- .../src/server/ReactPartialRenderer.js | 28 +++++------ .../src/shared/CSSPropertyOperations.js | 4 +- .../src/shared/HTMLDOMPropertyConfig.js | 2 +- .../react-dom/src/shared/ReactDOMInjection.js | 6 +-- .../src/shared/ReactDOMInvalidARIAHook.js | 4 +- .../shared/ReactDOMNullInputValuePropHook.js | 2 +- .../src/shared/ReactDOMUnknownPropertyHook.js | 8 ++-- .../src/shared/SVGDOMPropertyConfig.js | 2 +- .../react-dom/src/shared/assertValidProps.js | 2 +- .../src/shared/dangerousStyleValue.js | 2 +- .../shared/quoteAttributeValueForBrowser.js | 2 +- .../react-dom/src/shared/voidElementTags.js | 2 +- .../src/test-utils/ReactTestUtils.js | 10 ++-- .../ReactDOMUnstableNativeDependencies.js | 6 +-- .../src/NativeMethodsMixin.js | 10 ++-- .../src/ReactNativeAttributePayload.js | 3 +- .../src/ReactNativeBridgeEventPlugin.js | 4 +- .../src/ReactNativeComponent.js | 10 ++-- .../src/ReactNativeEventEmitter.js | 12 ++--- .../src/ReactNativeFiberErrorDialog.js | 1 + .../src/ReactNativeFiberHostComponent.js | 6 ++- .../src/ReactNativeFiberInspector.js | 12 +++-- .../src/ReactNativeFiberRenderer.js | 14 +++--- .../src/ReactNativeGlobalResponderHandler.js | 1 + .../src/ReactNativeInjection.js | 18 ++++---- .../src/ReactNativeRenderer.js | 25 +++++----- .../ReactNativeAttributePayload-test.js | 4 +- .../src/__tests__/ReactNativeEvents-test.js | 6 +-- .../src/__tests__/ReactNativeMount-test.js | 2 +- .../createReactNativeComponentClass-test.js | 2 +- .../src/createReactNativeComponentClass.js | 2 +- .../src/findNodeHandle.js | 8 ++-- .../src/findNumericNodeHandle.js | 2 +- .../react-native-renderer/src/takeSnapshot.js | 3 +- packages/react-noop-renderer/src/ReactNoop.js | 7 +-- .../react-reconciler/src/ReactChildFiber.js | 12 ++--- .../src/ReactDebugCurrentFiber.js | 6 +-- .../src/ReactDebugFiberPerf.js | 4 +- packages/react-reconciler/src/ReactFiber.js | 10 ++-- .../src/ReactFiberBeginWork.js | 20 ++++---- .../src/ReactFiberClassComponent.js | 20 ++++---- .../src/ReactFiberCommitWork.js | 14 +++--- .../src/ReactFiberCompleteWork.js | 12 ++--- .../react-reconciler/src/ReactFiberContext.js | 12 ++--- .../src/ReactFiberErrorLogger.js | 2 +- .../src/ReactFiberHostContext.js | 2 +- .../src/ReactFiberHydrationContext.js | 6 +-- .../src/ReactFiberReconciler.js | 20 ++++---- .../react-reconciler/src/ReactFiberRoot.js | 4 +- .../src/ReactFiberScheduler.js | 46 +++++++++---------- .../src/ReactFiberUpdateQueue.js | 6 +-- .../src/__tests__/ReactCoroutine-test.js | 3 +- .../src/__tests__/ReactPersistent-test.js | 2 +- .../react-rt-renderer/src/ReactNativeRT.js | 21 +++++---- .../src/ReactNativeRTEventEmitter.js | 6 ++- .../src/ReactNativeRTFiberInspector.js | 8 ++-- .../src/ReactNativeRTFiberRenderer.js | 6 ++- .../src/ReactShallowRenderer.js | 4 +- .../src/ReactTestRenderer.js | 6 +-- .../shared/ReactFiberComponentTreeHook.js | 6 +-- packages/shared/ReactFiberTreeReflection.js | 10 ++-- packages/shared/ReactTreeTraversal.js | 2 +- .../shared/__tests__/ReactErrorUtils-test.js | 2 +- .../__tests__/reactProdInvariant-test.js | 2 +- 146 files changed, 523 insertions(+), 473 deletions(-) diff --git a/packages/events/EventPluginHub.js b/packages/events/EventPluginHub.js index 7238b3ec773a..b362c880cf16 100644 --- a/packages/events/EventPluginHub.js +++ b/packages/events/EventPluginHub.js @@ -9,12 +9,12 @@ 'use strict'; -var EventPluginRegistry = require('EventPluginRegistry'); -var EventPluginUtils = require('EventPluginUtils'); -var ReactErrorUtils = require('ReactErrorUtils'); +var EventPluginRegistry = require('./EventPluginRegistry'); +var EventPluginUtils = require('./EventPluginUtils'); +var ReactErrorUtils = require('../ReactErrorUtils'); -var accumulateInto = require('accumulateInto'); -var forEachAccumulated = require('forEachAccumulated'); +var accumulateInto = require('./accumulateInto'); +var forEachAccumulated = require('./forEachAccumulated'); var invariant = require('fbjs/lib/invariant'); /** diff --git a/packages/events/EventPluginUtils.js b/packages/events/EventPluginUtils.js index e5e80995457e..201fe7c87a6e 100644 --- a/packages/events/EventPluginUtils.js +++ b/packages/events/EventPluginUtils.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactErrorUtils = require('ReactErrorUtils'); +var ReactErrorUtils = require('../ReactErrorUtils'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/events/EventPropagators.js b/packages/events/EventPropagators.js index 9788e09f73d2..dd733e1b06e7 100644 --- a/packages/events/EventPropagators.js +++ b/packages/events/EventPropagators.js @@ -9,11 +9,11 @@ 'use strict'; -var EventPluginHub = require('EventPluginHub'); -var ReactTreeTraversal = require('ReactTreeTraversal'); +var EventPluginHub = require('./EventPluginHub'); +var ReactTreeTraversal = require('../ReactTreeTraversal'); -var accumulateInto = require('accumulateInto'); -var forEachAccumulated = require('forEachAccumulated'); +var accumulateInto = require('./accumulateInto'); +var forEachAccumulated = require('./forEachAccumulated'); type PropagationPhases = 'bubbled' | 'captured'; diff --git a/packages/events/ReactControlledComponent.js b/packages/events/ReactControlledComponent.js index 45eec0c89eb6..5ec27a4e879a 100644 --- a/packages/events/ReactControlledComponent.js +++ b/packages/events/ReactControlledComponent.js @@ -9,7 +9,7 @@ 'use strict'; -var EventPluginUtils = require('EventPluginUtils'); +var EventPluginUtils = require('./EventPluginUtils'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/events/ReactEventEmitterMixin.js b/packages/events/ReactEventEmitterMixin.js index b594b088a6fb..51b0ee5d675c 100644 --- a/packages/events/ReactEventEmitterMixin.js +++ b/packages/events/ReactEventEmitterMixin.js @@ -9,7 +9,7 @@ 'use strict'; -var EventPluginHub = require('EventPluginHub'); +var EventPluginHub = require('./EventPluginHub'); function runEventQueueInBatch(events) { EventPluginHub.enqueueEvents(events); diff --git a/packages/events/ReactGenericBatching.js b/packages/events/ReactGenericBatching.js index 6517db8b3a4c..617bc9d86da7 100644 --- a/packages/events/ReactGenericBatching.js +++ b/packages/events/ReactGenericBatching.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactControlledComponent = require('ReactControlledComponent'); +var ReactControlledComponent = require('./ReactControlledComponent'); // Used as a way to call batchedUpdates when we don't have a reference to // the renderer. Such as when we're dispatching events or if third party diff --git a/packages/events/ResponderEventPlugin.js b/packages/events/ResponderEventPlugin.js index 494fbb5a1db2..0c9e4a0699a1 100644 --- a/packages/events/ResponderEventPlugin.js +++ b/packages/events/ResponderEventPlugin.js @@ -9,13 +9,13 @@ 'use strict'; -var EventPluginUtils = require('EventPluginUtils'); -var EventPropagators = require('EventPropagators'); -var ReactTreeTraversal = require('ReactTreeTraversal'); -var ResponderSyntheticEvent = require('ResponderSyntheticEvent'); -var ResponderTouchHistoryStore = require('ResponderTouchHistoryStore'); +var EventPluginUtils = require('../EventPluginUtils'); +var EventPropagators = require('../EventPropagators'); +var ReactTreeTraversal = require('../../ReactTreeTraversal'); +var ResponderSyntheticEvent = require('./ResponderSyntheticEvent'); +var ResponderTouchHistoryStore = require('./ResponderTouchHistoryStore'); -var accumulate = require('accumulate'); +var accumulate = require('../accumulate'); var isStartish = EventPluginUtils.isStartish; var isMoveish = EventPluginUtils.isMoveish; diff --git a/packages/events/ResponderSyntheticEvent.js b/packages/events/ResponderSyntheticEvent.js index 9b9acefcf92f..0dbe0b4d639c 100644 --- a/packages/events/ResponderSyntheticEvent.js +++ b/packages/events/ResponderSyntheticEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticEvent = require('SyntheticEvent'); +var SyntheticEvent = require('../SyntheticEvent'); /** * `touchHistory` isn't actually on the native event, but putting it in the diff --git a/packages/events/ResponderTouchHistoryStore.js b/packages/events/ResponderTouchHistoryStore.js index 020631b394b9..24deabd56828 100644 --- a/packages/events/ResponderTouchHistoryStore.js +++ b/packages/events/ResponderTouchHistoryStore.js @@ -10,7 +10,7 @@ 'use strict'; -const EventPluginUtils = require('EventPluginUtils'); +const EventPluginUtils = require('../EventPluginUtils'); const invariant = require('fbjs/lib/invariant'); diff --git a/packages/events/__tests__/EventPluginRegistry-test.js b/packages/events/__tests__/EventPluginRegistry-test.js index 936865cfec1f..7fe430719a96 100644 --- a/packages/events/__tests__/EventPluginRegistry-test.js +++ b/packages/events/__tests__/EventPluginRegistry-test.js @@ -16,7 +16,7 @@ describe('EventPluginRegistry', () => { beforeEach(() => { jest.resetModuleRegistry(); // TODO: can we express this test with only public API? - EventPluginRegistry = require('EventPluginRegistry'); + EventPluginRegistry = require('../EventPluginRegistry'); createPlugin = function(properties) { return Object.assign({extractEvents: function() {}}, properties); diff --git a/packages/events/__tests__/ResponderEventPlugin-test.js b/packages/events/__tests__/ResponderEventPlugin-test.js index 90a7ad6d4386..ff542b066656 100644 --- a/packages/events/__tests__/ResponderEventPlugin-test.js +++ b/packages/events/__tests__/ResponderEventPlugin-test.js @@ -9,7 +9,7 @@ 'use strict'; -var {HostComponent} = require('ReactTypeOfWork'); +var {HostComponent} = require('../../../ReactTypeOfWork'); var EventPluginHub; var ResponderEventPlugin; diff --git a/packages/events/__tests__/accumulateInto-test.js b/packages/events/__tests__/accumulateInto-test.js index 990c53465520..addb6c064256 100644 --- a/packages/events/__tests__/accumulateInto-test.js +++ b/packages/events/__tests__/accumulateInto-test.js @@ -13,7 +13,7 @@ var accumulateInto; describe('accumulateInto', () => { beforeEach(() => { - accumulateInto = require('accumulateInto'); + accumulateInto = require('../accumulateInto'); }); it('throws if the second item is null', () => { diff --git a/packages/react-cs-renderer/src/ReactNativeCS.js b/packages/react-cs-renderer/src/ReactNativeCS.js index 9e5d8ecb997b..9e7f0b85cd86 100644 --- a/packages/react-cs-renderer/src/ReactNativeCS.js +++ b/packages/react-cs-renderer/src/ReactNativeCS.js @@ -12,7 +12,7 @@ const ReactGenericBatching = require('shared/event/ReactGenericBatching'); const ReactVersion = require('shared/ReactVersion'); -// TODO: export or move to shared. +// TODO: direct imports like some-package/src/* are bad. Fix me. const {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); import type {ReactNativeCSType} from 'ReactNativeCSTypes'; diff --git a/packages/react-dom/index.fb.js b/packages/react-dom/index.fb.js index 9c7cfca72f5e..7e156de9dd7d 100644 --- a/packages/react-dom/index.fb.js +++ b/packages/react-dom/index.fb.js @@ -11,16 +11,17 @@ var ReactDOM = require('./src/client/ReactDOM'); Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, { // These are real internal dependencies that are trickier to remove: - ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'), - ReactErrorUtils: require('ReactErrorUtils'), - ReactFiberErrorLogger: require('ReactFiberErrorLogger'), - ReactFiberTreeReflection: require('ReactFiberTreeReflection'), - ReactDOMComponentTree: require('ReactDOMComponentTree'), - ReactInstanceMap: require('ReactInstanceMap'), + ReactBrowserEventEmitter: require('./src/client/ReactBrowserEventEmitter'), + ReactErrorUtils: require('shared/ReactErrorUtils'), + // TODO: direct imports like some-package/src/* are bad. Fix me. + ReactFiberErrorLogger: require('react-reconciler/src/ReactFiberErrorLogger'), + ReactFiberTreeReflection: require('shared/ReactFiberTreeReflection'), + ReactDOMComponentTree: require('./src/client/ReactDOMComponentTree'), + ReactInstanceMap: require('shared/ReactInstanceMap'), // These are dependencies of TapEventPlugin: - EventPluginUtils: require('EventPluginUtils'), - EventPropagators: require('EventPropagators'), - SyntheticUIEvent: require('SyntheticUIEvent'), + EventPluginUtils: require('shared/event/EventPluginUtils'), + EventPropagators: require('shared/event/EventPropagators'), + SyntheticUIEvent: require('./client/event/SyntheticUIEvent'), }); module.exports = ReactDOM; diff --git a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js index 0efb4b3cceb1..64c8697e14d6 100644 --- a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js +++ b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js @@ -59,14 +59,14 @@ describe('ReactBrowserEventEmitter', () => { LISTENER.mockClear(); EventListener = require('fbjs/lib/EventListener'); // TODO: can we express this test with only public API? - EventPluginHub = require('EventPluginHub'); - EventPluginRegistry = require('EventPluginRegistry'); + EventPluginHub = require('shared/EventPluginHub'); + EventPluginRegistry = require('shared/EventPluginRegistry'); React = require('react'); ReactDOM = require('react-dom'); - ReactDOMComponentTree = require('ReactDOMComponentTree'); - ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); + ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); + ReactBrowserEventEmitter = require('../client/event/ReactBrowserEventEmitter'); ReactTestUtils = require('react-dom/test-utils'); - TapEventPlugin = require('TapEventPlugin'); + TapEventPlugin = require('../client/event/plugins/TapEventPlugin'); var container = document.createElement('div'); diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js index b1211e03de7b..b0f205a14850 100644 --- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js @@ -27,7 +27,7 @@ describe('ReactDOMComponent', () => { ReactDOMServer = require('react-dom/server'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - inputValueTracking = require('inputValueTracking'); + inputValueTracking = require('../client/inputValueTracking'); }); describe('updateDOM', () => { diff --git a/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js b/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js index c3cf73bd457a..366cedd08d3d 100644 --- a/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js @@ -34,7 +34,7 @@ describe('ReactDOMComponentTree', () => { React = require('react'); ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('ReactDOMComponentTree'); + ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); ReactDOMServer = require('react-dom/server'); }); diff --git a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js index c8217bae9dc0..e3ddbffb6acb 100644 --- a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js @@ -24,8 +24,8 @@ describe('ReactDOMEventListener', () => { React = require('react'); ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('ReactDOMComponentTree'); - ReactDOMEventListener = require('ReactDOMEventListener'); + ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); + ReactDOMEventListener = require('../client/event/ReactDOMEventListener'); ReactTestUtils = require('react-dom/test-utils'); handleTopLevel = jest.fn(); diff --git a/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js b/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js index e8b4726e5c2f..94fb3d630355 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js @@ -1,5 +1,16 @@ +/** + * Copyright (c) 2013-present, Facebook, Inc. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @emails react-core + */ + +'use strict'; + var React = require('react'); -var ReactFeatureFlags = require('ReactFeatureFlags'); +var ReactFeatureFlags = require('shared/ReactFeatureFlags'); var ReactDOM; diff --git a/packages/react-dom/src/__tests__/ReactDOMSelection-test.js b/packages/react-dom/src/__tests__/ReactDOMSelection-test.js index 431680ee7064..74ff592b0ab7 100644 --- a/packages/react-dom/src/__tests__/ReactDOMSelection-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMSelection-test.js @@ -20,8 +20,8 @@ describe('ReactDOMSelection', () => { beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); - ReactDOMSelection = require('ReactDOMSelection'); - invariant = require('invariant'); + ReactDOMSelection = require('../client/ReactDOMSelection'); + invariant = require('fbjs/lib/invariant'); ({getModernOffsetsFromPoints} = ReactDOMSelection); }); diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegration-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegration-test.js index 794a4898b6b2..06d8a0eef18c 100644 --- a/packages/react-dom/src/__tests__/ReactDOMServerIntegration-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMServerIntegration-test.js @@ -314,7 +314,7 @@ function resetModules() { jest.resetModuleRegistry(); // TODO: can we express this test with only public API? - ExecutionEnvironment = require('ExecutionEnvironment'); + ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); PropTypes = require('prop-types'); React = require('react'); diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js index 3e82973ace23..d424b5df8a1d 100644 --- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js +++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js @@ -34,7 +34,7 @@ describe('ReactDOMServer', () => { ExecutionEnvironment.canUseDOM = false; ReactDOMServer = require('react-dom/server'); - var DOMProperty = require('DOMProperty'); + var DOMProperty = require('../shared/DOMProperty'); ROOT_ATTRIBUTE_NAME = DOMProperty.ROOT_ATTRIBUTE_NAME; }); diff --git a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js index 0353db1c5232..1dd1b78dc643 100644 --- a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js +++ b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js @@ -11,7 +11,7 @@ var React = require('react'); // TODO: can we express this test with only public API? -var ReactDOMComponentTree = require('ReactDOMComponentTree'); +var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); var ReactTestUtils = require('react-dom/test-utils'); /** diff --git a/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js b/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js index 889eeae8c3fb..cd2bfedaed77 100644 --- a/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js +++ b/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js @@ -11,7 +11,7 @@ describe('escapeTextContentForBrowser', () => { // TODO: can we express this test with only public API? - var escapeTextContentForBrowser = require('escapeTextContentForBrowser'); + var escapeTextContentForBrowser = require('../shared/escapeTextContentForBrowser'); it('should escape boolean to string', () => { expect(escapeTextContentForBrowser(true)).toBe('true'); diff --git a/packages/react-dom/src/__tests__/inputValueTracking-test.js b/packages/react-dom/src/__tests__/inputValueTracking-test.js index a33ccb0bc46f..c7805559838b 100644 --- a/packages/react-dom/src/__tests__/inputValueTracking-test.js +++ b/packages/react-dom/src/__tests__/inputValueTracking-test.js @@ -13,7 +13,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); var ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? -var inputValueTracking = require('inputValueTracking'); +var inputValueTracking = require('../client/inputValueTracking'); var getTracker = inputValueTracking._getTrackerFromNode; diff --git a/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js b/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js index eed402caf79c..75300623f61a 100644 --- a/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js +++ b/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js @@ -11,7 +11,7 @@ describe('quoteAttributeValueForBrowser', () => { // TODO: can we express this test with only public API? - var quoteAttributeValueForBrowser = require('quoteAttributeValueForBrowser'); + var quoteAttributeValueForBrowser = require('../shared/quoteAttributeValueForBrowser'); it('should escape boolean to string', () => { expect(quoteAttributeValueForBrowser(true)).toBe('"true"'); diff --git a/packages/react-dom/src/__tests__/validateDOMNesting-test.js b/packages/react-dom/src/__tests__/validateDOMNesting-test.js index e3c76a843b89..f317c211582b 100644 --- a/packages/react-dom/src/__tests__/validateDOMNesting-test.js +++ b/packages/react-dom/src/__tests__/validateDOMNesting-test.js @@ -136,7 +136,7 @@ describe('ReactContextValidator', () => { jest.resetModules(); // TODO: can we express this test with only public API? - validateDOMNesting = require('validateDOMNesting'); + validateDOMNesting = require('../client/validateDOMNesting'); }); it('allows any tag with no context', () => { diff --git a/packages/react-dom/src/client/DOMPropertyOperations.js b/packages/react-dom/src/client/DOMPropertyOperations.js index 0c278cfdc805..43bae6f3e7d8 100644 --- a/packages/react-dom/src/client/DOMPropertyOperations.js +++ b/packages/react-dom/src/client/DOMPropertyOperations.js @@ -9,7 +9,7 @@ 'use strict'; -var DOMProperty = require('DOMProperty'); +var DOMProperty = require('../shared/DOMProperty'); if (__DEV__) { var warning = require('fbjs/lib/warning'); diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index 384327b6b9f2..d1ef3c6c91ca 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -11,23 +11,21 @@ import type {ReactNodeList} from 'ReactTypes'; -require('checkReact'); -var DOMNamespaces = require('DOMNamespaces'); +require('../shared/checkReact'); +var DOMNamespaces = require('../shared/DOMNamespaces'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); -var ReactControlledComponent = require('ReactControlledComponent'); -var ReactFeatureFlags = require('ReactFeatureFlags'); -var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var ReactDOMFiberComponent = require('ReactDOMFiberComponent'); -var ReactDOMFrameScheduling = require('ReactDOMFrameScheduling'); -var ReactGenericBatching = require('ReactGenericBatching'); +var ReactBrowserEventEmitter = require('./event/ReactBrowserEventEmitter'); +var ReactControlledComponent = require('shared/event/ReactControlledComponent'); +var ReactFeatureFlags = require('shared/ReactFeatureFlags'); +var ReactDOMComponentTree = require('./ReactDOMComponentTree'); +var ReactDOMFiberComponent = require('./ReactDOMFiberComponent'); +var ReactDOMFrameScheduling = require('shared/ReactDOMFrameScheduling'); +var ReactGenericBatching = require('shared/event/ReactGenericBatching'); var ReactFiberReconciler = require('react-reconciler'); -var ReactInputSelection = require('ReactInputSelection'); -var ReactInstanceMap = require('ReactInstanceMap'); -var ReactPortal = require('ReactPortal'); -var ReactVersion = require('ReactVersion'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); -var {injectInternals} = require('ReactFiberDevToolsHook'); +var ReactInputSelection = require('./ReactInputSelection'); +var ReactInstanceMap = require('shared/ReactInstanceMap'); +var ReactVersion = require('shared/ReactVersion'); +var {ReactCurrentOwner} = require('shared/ReactGlobalSharedState'); var { ELEMENT_NODE, TEXT_NODE, @@ -37,7 +35,11 @@ var { } = require('HTMLNodeType'); var {ROOT_ATTRIBUTE_NAME} = require('DOMProperty'); -var getComponentName = require('getComponentName'); +// TODO: direct imports like some-package/src/* are bad. Fix me. +var ReactPortal = require('react-reconciler/src/isomoprhic/ReactPortal'); +var {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); + +var getComponentName = require('shared/getComponentName'); var invariant = require('fbjs/lib/invariant'); var {getChildNamespace} = DOMNamespaces; diff --git a/packages/react-dom/src/client/ReactDOMClientInjection.js b/packages/react-dom/src/client/ReactDOMClientInjection.js index 31b19930ee63..f2c97c0b3cbb 100644 --- a/packages/react-dom/src/client/ReactDOMClientInjection.js +++ b/packages/react-dom/src/client/ReactDOMClientInjection.js @@ -9,17 +9,17 @@ 'use strict'; -var BeforeInputEventPlugin = require('BeforeInputEventPlugin'); -var ChangeEventPlugin = require('ChangeEventPlugin'); -var DOMEventPluginOrder = require('DOMEventPluginOrder'); -var EnterLeaveEventPlugin = require('EnterLeaveEventPlugin'); -var EventPluginHub = require('EventPluginHub'); -var EventPluginUtils = require('EventPluginUtils'); -var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); -var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var ReactDOMEventListener = require('ReactDOMEventListener'); -var SelectEventPlugin = require('SelectEventPlugin'); -var SimpleEventPlugin = require('SimpleEventPlugin'); +var BeforeInputEventPlugin = require('./event/plugins/BeforeInputEventPlugin'); +var ChangeEventPlugin = require('/event/plugins/ChangeEventPlugin'); +var DOMEventPluginOrder = require('./event/plugins/DOMEventPluginOrder'); +var EnterLeaveEventPlugin = require('./event/plugins/EnterLeaveEventPlugin'); +var EventPluginHub = require('./event/EventPluginHub'); +var EventPluginUtils = require('./event/EventPluginUtils'); +var ReactBrowserEventEmitter = require('./event/ReactBrowserEventEmitter'); +var ReactDOMComponentTree = require('./ReactDOMComponentTree'); +var ReactDOMEventListener = require('./event/ReactDOMEventListener'); +var SelectEventPlugin = require('./event/plugins/SelectEventPlugin'); +var SimpleEventPlugin = require('./event/plugins/SimpleEventPlugin'); ReactDOMEventListener.setHandleTopLevel( ReactBrowserEventEmitter.handleTopLevel, diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js index 3ad08af4b59e..24b23af3c08e 100644 --- a/packages/react-dom/src/client/ReactDOMFiberComponent.js +++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js @@ -10,32 +10,36 @@ 'use strict'; -var CSSPropertyOperations = require('CSSPropertyOperations'); -var DOMNamespaces = require('DOMNamespaces'); -var DOMProperty = require('DOMProperty'); -var DOMPropertyOperations = require('DOMPropertyOperations'); -var EventPluginRegistry = require('EventPluginRegistry'); -var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); -var ReactDOMFiberInput = require('ReactDOMFiberInput'); -var ReactDOMFiberOption = require('ReactDOMFiberOption'); -var ReactDOMFiberSelect = require('ReactDOMFiberSelect'); -var ReactDOMFiberTextarea = require('ReactDOMFiberTextarea'); -var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber'); -var {DOCUMENT_NODE, DOCUMENT_FRAGMENT_NODE} = require('HTMLNodeType'); +var CSSPropertyOperations = require('../shared/CSSPropertyOperations'); +var DOMNamespaces = require('../shared/DOMNamespaces'); +var DOMProperty = require('../shared/DOMProperty'); +var DOMPropertyOperations = require('../shared/DOMPropertyOperations'); +var EventPluginRegistry = require('shared/event/EventPluginRegistry'); +var ReactBrowserEventEmitter = require('./event/ReactBrowserEventEmitter'); +var ReactDOMFiberInput = require('./ReactDOMFiberInput'); +var ReactDOMFiberOption = require('./ReactDOMFiberOption'); +var ReactDOMFiberSelect = require('./ReactDOMFiberSelect'); +var ReactDOMFiberTextarea = require('./ReactDOMFiberTextarea'); -var assertValidProps = require('assertValidProps'); +// 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 emptyFunction = require('fbjs/lib/emptyFunction'); -var inputValueTracking = require('inputValueTracking'); -var isCustomComponent = require('isCustomComponent'); -var setInnerHTML = require('setInnerHTML'); -var setTextContent = require('setTextContent'); +var inputValueTracking = require('./inputValueTracking'); +var isCustomComponent = require('../shared/isCustomComponent'); +var setInnerHTML = require('./setInnerHTML'); +var setTextContent = require('./setTextContent'); if (__DEV__) { var warning = require('fbjs/lib/warning'); - var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber'); - var ReactDOMInvalidARIAHook = require('ReactDOMInvalidARIAHook'); - var ReactDOMNullInputValuePropHook = require('ReactDOMNullInputValuePropHook'); - var ReactDOMUnknownPropertyHook = require('ReactDOMUnknownPropertyHook'); + // TODO: direct imports like some-package/src/* are bad. Fix me. + var {getCurrentFiberStackAddendum} = require('react-reconciler/src/ReactDebugCurrentFiber'); + var ReactDOMInvalidARIAHook = require('../shared/ReactDOMInvalidARIAHook'); + var ReactDOMNullInputValuePropHook = require('../shared/ReactDOMNullInputValuePropHook'); + var ReactDOMUnknownPropertyHook = require('../shared/ReactDOMUnknownPropertyHook'); var {validateProperties: validateARIAProperties} = ReactDOMInvalidARIAHook; var { validateProperties: validateInputProperties, diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js index 89f1056bc410..0bcbf6f3d8b7 100644 --- a/packages/react-dom/src/client/ReactDOMFiberInput.js +++ b/packages/react-dom/src/client/ReactDOMFiberInput.js @@ -18,13 +18,16 @@ type InputWithWrapperState = HTMLInputElement & { }, }; -var DOMPropertyOperations = require('DOMPropertyOperations'); -var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes'); -var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber'); +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'); if (__DEV__) { - var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber'); + // TODO: direct imports like some-package/src/* are bad. Fix me. + var {getCurrentFiberStackAddendum} = require('react-reconciler/src/ReactDebugCurrentFiber'); var warning = require('fbjs/lib/warning'); } diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js index d35d0bf179ae..5439c060d484 100644 --- a/packages/react-dom/src/client/ReactDOMFiberSelect.js +++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js @@ -17,13 +17,14 @@ type SelectWithWrapperState = HTMLSelectElement & { }, }; -var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes'); -var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber'); +var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); +var {getCurrentFiberOwnerName} = require('react-reconciler/src/ReactDebugCurrentFiber'); if (__DEV__) { var didWarnValueDefaultValue = false; var warning = require('fbjs/lib/warning'); - var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber'); + // TODO: direct imports like some-package/src/* are bad. Fix me. + var {getCurrentFiberStackAddendum} = require('react-reconciler/src/ReactDebugCurrentFiber'); } function getDeclarationErrorAddendum() { diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js index 72e17b2b9d18..b205c69f7c8a 100644 --- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js +++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js @@ -16,13 +16,14 @@ type TextAreaWithWrapperState = HTMLTextAreaElement & { }, }; -var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes'); +var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { var warning = require('fbjs/lib/warning'); - var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber'); + // 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 61a1882636a0..0b87054ec89e 100644 --- a/packages/react-dom/src/client/ReactDOMSelection.js +++ b/packages/react-dom/src/client/ReactDOMSelection.js @@ -9,10 +9,10 @@ 'use strict'; -var {TEXT_NODE} = require('HTMLNodeType'); +var {TEXT_NODE} = require('shared/HTMLNodeType'); -var getNodeForCharacterOffset = require('getNodeForCharacterOffset'); -var getTextContentAccessor = require('getTextContentAccessor'); +var getNodeForCharacterOffset = require('./getNodeForCharacterOffset'); +var getTextContentAccessor = require('./getTextContentAccessor'); /** * @param {DOMElement} outerNode diff --git a/packages/react-dom/src/client/ReactInputSelection.js b/packages/react-dom/src/client/ReactInputSelection.js index 81f788aa5c8d..3dea75b8523b 100644 --- a/packages/react-dom/src/client/ReactInputSelection.js +++ b/packages/react-dom/src/client/ReactInputSelection.js @@ -9,8 +9,8 @@ 'use strict'; -var ReactDOMSelection = require('ReactDOMSelection'); -var {ELEMENT_NODE} = require('HTMLNodeType'); +var ReactDOMSelection = require('./ReactDOMSelection'); +var {ELEMENT_NODE} = require('shared/HTMLNodeType'); var containsNode = require('fbjs/lib/containsNode'); var focusNode = require('fbjs/lib/focusNode'); diff --git a/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js b/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js index 534d6442e682..1e465d6bf5cb 100644 --- a/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js +++ b/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getNodeForCharacterOffset = require('getNodeForCharacterOffset'); +var getNodeForCharacterOffset = require('../client/getNodeForCharacterOffset'); // Create node from HTML string function createNode(html) { diff --git a/packages/react-dom/src/client/__tests__/setInnerHTML-test.js b/packages/react-dom/src/client/__tests__/setInnerHTML-test.js index 6b2cd5b6ac97..975ffb14ede8 100644 --- a/packages/react-dom/src/client/__tests__/setInnerHTML-test.js +++ b/packages/react-dom/src/client/__tests__/setInnerHTML-test.js @@ -10,8 +10,8 @@ 'use strict'; // TODO: can we express this test with only public API? -var setInnerHTML = require('setInnerHTML'); -var Namespaces = require('DOMNamespaces').Namespaces; +var setInnerHTML = require('../client/setInnerHTML'); +var Namespaces = require('../client/DOMNamespaces').Namespaces; describe('setInnerHTML', () => { describe('when the node has innerHTML property', () => { diff --git a/packages/react-dom/src/client/getNodeForCharacterOffset.js b/packages/react-dom/src/client/getNodeForCharacterOffset.js index acaece0f3833..03c1232e9587 100644 --- a/packages/react-dom/src/client/getNodeForCharacterOffset.js +++ b/packages/react-dom/src/client/getNodeForCharacterOffset.js @@ -9,7 +9,7 @@ 'use strict'; -var {TEXT_NODE} = require('HTMLNodeType'); +var {TEXT_NODE} = require('shared/HTMLNodeType'); /** * Given any node return the first leaf node without children. diff --git a/packages/react-dom/src/client/setInnerHTML.js b/packages/react-dom/src/client/setInnerHTML.js index 4a749ab3be44..509eae70fcb5 100644 --- a/packages/react-dom/src/client/setInnerHTML.js +++ b/packages/react-dom/src/client/setInnerHTML.js @@ -9,8 +9,8 @@ 'use strict'; -var Namespaces = require('DOMNamespaces').Namespaces; -var createMicrosoftUnsafeLocalFunction = require('createMicrosoftUnsafeLocalFunction'); +var Namespaces = require('../shared/DOMNamespaces').Namespaces; +var createMicrosoftUnsafeLocalFunction = require('../shared/createMicrosoftUnsafeLocalFunction'); // SVG temp container for IE lacking innerHTML var reusableSVGContainer; diff --git a/packages/react-dom/src/client/setTextContent.js b/packages/react-dom/src/client/setTextContent.js index f9b2f1e635a2..0e11fce62c0a 100644 --- a/packages/react-dom/src/client/setTextContent.js +++ b/packages/react-dom/src/client/setTextContent.js @@ -10,9 +10,9 @@ 'use strict'; var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var escapeTextContentForBrowser = require('escapeTextContentForBrowser'); -var setInnerHTML = require('setInnerHTML'); -var {TEXT_NODE} = require('HTMLNodeType'); +var escapeTextContentForBrowser = require('../shared/escapeTextContentForBrowser'); +var setInnerHTML = require('./setInnerHTML'); +var {TEXT_NODE} = require('shared/HTMLNodeType'); /** * Set the textContent property of a node, ensuring that whitespace is preserved diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js index ba6d55d81388..9eb7287e9058 100644 --- a/packages/react-dom/src/client/validateDOMNesting.js +++ b/packages/react-dom/src/client/validateDOMNesting.js @@ -15,7 +15,8 @@ var validateDOMNesting = emptyFunction; if (__DEV__) { var warning = require('fbjs/lib/warning'); - var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber'); + // TODO: direct imports like some-package/src/* are bad. Fix me. + var {getCurrentFiberStackAddendum} = require('react-reconciler/src/ReactDebugCurrentFiber'); // 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 b4f6b9bd473e..a1ea02644bc4 100644 --- a/packages/react-dom/src/events/BeforeInputEventPlugin.js +++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js @@ -9,11 +9,11 @@ 'use strict'; -var EventPropagators = require('EventPropagators'); +var EventPropagators = require('shared/event/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var FallbackCompositionState = require('FallbackCompositionState'); -var SyntheticCompositionEvent = require('SyntheticCompositionEvent'); -var SyntheticInputEvent = require('SyntheticInputEvent'); +var FallbackCompositionState = require('../FallbackCompositionState'); +var SyntheticCompositionEvent = require('../../SyntheticCompositionEvent'); +var SyntheticInputEvent = require('../../SyntheticInputEvent'); import type {TopLevelTypes} from 'BrowserEventConstants'; diff --git a/packages/react-dom/src/events/BrowserEventConstants.js b/packages/react-dom/src/events/BrowserEventConstants.js index 786983ad6489..052943b7b26c 100644 --- a/packages/react-dom/src/events/BrowserEventConstants.js +++ b/packages/react-dom/src/events/BrowserEventConstants.js @@ -9,7 +9,7 @@ 'use strict'; -var getVendorPrefixedEventName = require('getVendorPrefixedEventName'); +var getVendorPrefixedEventName = require('./getVendorPrefixedEventName'); /** * Types of raw signals from the browser caught at the top level. diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js index 815ff6b035ef..a639170e1930 100644 --- a/packages/react-dom/src/events/ChangeEventPlugin.js +++ b/packages/react-dom/src/events/ChangeEventPlugin.js @@ -9,18 +9,18 @@ 'use strict'; -var EventPluginHub = require('EventPluginHub'); -var EventPropagators = require('EventPropagators'); +var EventPluginHub = require('shared/event/EventPluginHub'); +var EventPropagators = require('shared/event/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var ReactControlledComponent = require('ReactControlledComponent'); -var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var ReactGenericBatching = require('ReactGenericBatching'); -var SyntheticEvent = require('SyntheticEvent'); - -var inputValueTracking = require('inputValueTracking'); -var getEventTarget = require('getEventTarget'); -var isEventSupported = require('isEventSupported'); -var isTextInputElement = require('isTextInputElement'); +var ReactControlledComponent = require('shared/event/ReactControlledComponent'); +var ReactDOMComponentTree = require('../../ReactDOMComponentTree'); +var ReactGenericBatching = require('shared/event/ReactGenericBatching'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); + +var inputValueTracking = require('../../inputValueTracking'); +var getEventTarget = require('../getEventTarget'); +var isEventSupported = require('../isEventSupported'); +var isTextInputElement = require('shared/isTextInputElement'); var eventTypes = { change: { diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js index d7834f3dcc1b..1b31bf8c705d 100644 --- a/packages/react-dom/src/events/EnterLeaveEventPlugin.js +++ b/packages/react-dom/src/events/EnterLeaveEventPlugin.js @@ -9,9 +9,9 @@ 'use strict'; -var EventPropagators = require('EventPropagators'); -var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var SyntheticMouseEvent = require('SyntheticMouseEvent'); +var EventPropagators = require('shared/event/EventPropagators'); +var ReactDOMComponentTree = require('../../../ReactDOMComponentTree'); +var SyntheticMouseEvent = require('../SyntheticMouseEvent'); var eventTypes = { mouseEnter: { diff --git a/packages/react-dom/src/events/FallbackCompositionState.js b/packages/react-dom/src/events/FallbackCompositionState.js index 314eb64fb7a2..b05d5633f0ff 100644 --- a/packages/react-dom/src/events/FallbackCompositionState.js +++ b/packages/react-dom/src/events/FallbackCompositionState.js @@ -9,7 +9,7 @@ 'use strict'; -var getTextContentAccessor = require('getTextContentAccessor'); +var getTextContentAccessor = require('../../getTextContentAccessor'); /** * This helper object stores information about text content of a target node, diff --git a/packages/react-dom/src/events/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js index c7ac57da4ded..7a7b14de2fa8 100644 --- a/packages/react-dom/src/events/ReactBrowserEventEmitter.js +++ b/packages/react-dom/src/events/ReactBrowserEventEmitter.js @@ -9,12 +9,12 @@ 'use strict'; -var EventPluginRegistry = require('EventPluginRegistry'); -var ReactDOMEventListener = require('ReactDOMEventListener'); -var ReactEventEmitterMixin = require('ReactEventEmitterMixin'); +var EventPluginRegistry = require('shared/event/EventPluginRegistry'); +var ReactDOMEventListener = require('./ReactDOMEventListener'); +var ReactEventEmitterMixin = require('shared/event/ReactEventEmitterMixin'); -var isEventSupported = require('isEventSupported'); -var {topLevelTypes} = require('BrowserEventConstants'); +var isEventSupported = require('./isEventSupported'); +var {topLevelTypes} = require('shared/event/BrowserEventConstants'); /** * Summary of `ReactBrowserEventEmitter` event handling: diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js index 6950f06acae2..a1e600f50854 100644 --- a/packages/react-dom/src/events/ReactDOMEventListener.js +++ b/packages/react-dom/src/events/ReactDOMEventListener.js @@ -10,12 +10,12 @@ 'use strict'; var EventListener = require('fbjs/lib/EventListener'); -var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var ReactFiberTreeReflection = require('ReactFiberTreeReflection'); -var ReactGenericBatching = require('ReactGenericBatching'); -var ReactTypeOfWork = require('ReactTypeOfWork'); +var ReactDOMComponentTree = require('../ReactDOMComponentTree'); +var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); +var ReactGenericBatching = require('shared/event/ReactGenericBatching'); +var ReactTypeOfWork = require('shared/ReactTypeOfWork'); -var getEventTarget = require('getEventTarget'); +var getEventTarget = require('./getEventTarget'); var {HostRoot} = ReactTypeOfWork; diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js index 5b99fc1038f5..64a39efc4357 100644 --- a/packages/react-dom/src/events/SelectEventPlugin.js +++ b/packages/react-dom/src/events/SelectEventPlugin.js @@ -9,16 +9,16 @@ 'use strict'; -var EventPropagators = require('EventPropagators'); +var EventPropagators = require('shared/event/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); -var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var ReactInputSelection = require('ReactInputSelection'); -var SyntheticEvent = require('SyntheticEvent'); -var {DOCUMENT_NODE} = require('HTMLNodeType'); +var ReactBrowserEventEmitter = require('../ReactBrowserEventEmitter'); +var ReactDOMComponentTree = require('../../ReactDOMComponentTree'); +var ReactInputSelection = require('../../ReactInputSelection'); +var SyntheticEvent = require('../SyntheticEvent'); +var {DOCUMENT_NODE} = require('shared/HTMLNodeType'); var getActiveElement = require('fbjs/lib/getActiveElement'); -var isTextInputElement = require('isTextInputElement'); +var isTextInputElement = require('shared/isTextInputElement'); var shallowEqual = require('fbjs/lib/shallowEqual'); var skipSelectionChangeEvent = diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js index d33e45b936ba..30bdf67ae70a 100644 --- a/packages/react-dom/src/events/SimpleEventPlugin.js +++ b/packages/react-dom/src/events/SimpleEventPlugin.js @@ -10,20 +10,20 @@ 'use strict'; -var EventPropagators = require('EventPropagators'); -var SyntheticAnimationEvent = require('SyntheticAnimationEvent'); -var SyntheticClipboardEvent = require('SyntheticClipboardEvent'); -var SyntheticEvent = require('SyntheticEvent'); -var SyntheticFocusEvent = require('SyntheticFocusEvent'); -var SyntheticKeyboardEvent = require('SyntheticKeyboardEvent'); -var SyntheticMouseEvent = require('SyntheticMouseEvent'); -var SyntheticDragEvent = require('SyntheticDragEvent'); -var SyntheticTouchEvent = require('SyntheticTouchEvent'); -var SyntheticTransitionEvent = require('SyntheticTransitionEvent'); -var SyntheticUIEvent = require('SyntheticUIEvent'); -var SyntheticWheelEvent = require('SyntheticWheelEvent'); +var EventPropagators = require('shared/event/EventPropagators'); +var SyntheticAnimationEvent = require('../SyntheticAnimationEvent'); +var SyntheticClipboardEvent = require('../SyntheticClipboardEvent'); +var SyntheticEvent = require('../SyntheticEvent'); +var SyntheticFocusEvent = require('../SyntheticFocusEvent'); +var SyntheticKeyboardEvent = require('../SyntheticKeyboardEvent'); +var SyntheticMouseEvent = require('../SyntheticMouseEvent'); +var SyntheticDragEvent = require('../SyntheticDragEvent'); +var SyntheticTouchEvent = require('../SyntheticTouchEvent'); +var SyntheticTransitionEvent = require('../SyntheticTransitionEvent'); +var SyntheticUIEvent = require('../SyntheticUIEvent'); +var SyntheticWheelEvent = require('../SyntheticWheelEvent'); -var getEventCharCode = require('getEventCharCode'); +var getEventCharCode = require('../getEventCharCode'); if (__DEV__) { var warning = require('fbjs/lib/warning'); diff --git a/packages/react-dom/src/events/SyntheticAnimationEvent.js b/packages/react-dom/src/events/SyntheticAnimationEvent.js index 9198fb2eeacd..1c463695df4b 100644 --- a/packages/react-dom/src/events/SyntheticAnimationEvent.js +++ b/packages/react-dom/src/events/SyntheticAnimationEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticEvent = require('SyntheticEvent'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticClipboardEvent.js b/packages/react-dom/src/events/SyntheticClipboardEvent.js index 908672ab86c4..b29c4431988a 100644 --- a/packages/react-dom/src/events/SyntheticClipboardEvent.js +++ b/packages/react-dom/src/events/SyntheticClipboardEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticEvent = require('SyntheticEvent'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticCompositionEvent.js b/packages/react-dom/src/events/SyntheticCompositionEvent.js index 0bab1290bcbc..b8a218b0d38f 100644 --- a/packages/react-dom/src/events/SyntheticCompositionEvent.js +++ b/packages/react-dom/src/events/SyntheticCompositionEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticEvent = require('SyntheticEvent'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticDragEvent.js b/packages/react-dom/src/events/SyntheticDragEvent.js index 32f66345d172..dc200b45fb56 100644 --- a/packages/react-dom/src/events/SyntheticDragEvent.js +++ b/packages/react-dom/src/events/SyntheticDragEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticMouseEvent = require('SyntheticMouseEvent'); +var SyntheticMouseEvent = require('./SyntheticMouseEvent'); /** * @interface DragEvent diff --git a/packages/react-dom/src/events/SyntheticFocusEvent.js b/packages/react-dom/src/events/SyntheticFocusEvent.js index 167955722deb..5ca23658038f 100644 --- a/packages/react-dom/src/events/SyntheticFocusEvent.js +++ b/packages/react-dom/src/events/SyntheticFocusEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticUIEvent = require('SyntheticUIEvent'); +var SyntheticUIEvent = require('./SyntheticUIEvent'); /** * @interface FocusEvent diff --git a/packages/react-dom/src/events/SyntheticInputEvent.js b/packages/react-dom/src/events/SyntheticInputEvent.js index 08bf381b8b0f..261583fd9fb6 100644 --- a/packages/react-dom/src/events/SyntheticInputEvent.js +++ b/packages/react-dom/src/events/SyntheticInputEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticEvent = require('SyntheticEvent'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticKeyboardEvent.js b/packages/react-dom/src/events/SyntheticKeyboardEvent.js index 6514dc809b68..c803668a7faf 100644 --- a/packages/react-dom/src/events/SyntheticKeyboardEvent.js +++ b/packages/react-dom/src/events/SyntheticKeyboardEvent.js @@ -9,11 +9,11 @@ 'use strict'; -var SyntheticUIEvent = require('SyntheticUIEvent'); +var SyntheticUIEvent = require('./SyntheticUIEvent'); -var getEventCharCode = require('getEventCharCode'); -var getEventKey = require('getEventKey'); -var getEventModifierState = require('getEventModifierState'); +var getEventCharCode = require('./getEventCharCode'); +var getEventKey = require('./getEventKey'); +var getEventModifierState = require('./getEventModifierState'); /** * @interface KeyboardEvent diff --git a/packages/react-dom/src/events/SyntheticMouseEvent.js b/packages/react-dom/src/events/SyntheticMouseEvent.js index bfbe4f3e9c46..a9b5219edf92 100644 --- a/packages/react-dom/src/events/SyntheticMouseEvent.js +++ b/packages/react-dom/src/events/SyntheticMouseEvent.js @@ -9,9 +9,9 @@ 'use strict'; -var SyntheticUIEvent = require('SyntheticUIEvent'); +var SyntheticUIEvent = require('./SyntheticUIEvent'); -var getEventModifierState = require('getEventModifierState'); +var getEventModifierState = require('./getEventModifierState'); /** * @interface MouseEvent diff --git a/packages/react-dom/src/events/SyntheticTouchEvent.js b/packages/react-dom/src/events/SyntheticTouchEvent.js index c8bfb9f10ce5..477e6dad893a 100644 --- a/packages/react-dom/src/events/SyntheticTouchEvent.js +++ b/packages/react-dom/src/events/SyntheticTouchEvent.js @@ -9,9 +9,9 @@ 'use strict'; -var SyntheticUIEvent = require('SyntheticUIEvent'); +var SyntheticUIEvent = require('./SyntheticUIEvent'); -var getEventModifierState = require('getEventModifierState'); +var getEventModifierState = require('./getEventModifierState'); /** * @interface TouchEvent diff --git a/packages/react-dom/src/events/SyntheticTransitionEvent.js b/packages/react-dom/src/events/SyntheticTransitionEvent.js index 12095c11fc03..dc76fa5683f2 100644 --- a/packages/react-dom/src/events/SyntheticTransitionEvent.js +++ b/packages/react-dom/src/events/SyntheticTransitionEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticEvent = require('SyntheticEvent'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticUIEvent.js b/packages/react-dom/src/events/SyntheticUIEvent.js index 844b8cc360a1..b27c5ab2441d 100644 --- a/packages/react-dom/src/events/SyntheticUIEvent.js +++ b/packages/react-dom/src/events/SyntheticUIEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticEvent = require('SyntheticEvent'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); /** * @interface UIEvent diff --git a/packages/react-dom/src/events/SyntheticWheelEvent.js b/packages/react-dom/src/events/SyntheticWheelEvent.js index 100518eff55b..39237eb18883 100644 --- a/packages/react-dom/src/events/SyntheticWheelEvent.js +++ b/packages/react-dom/src/events/SyntheticWheelEvent.js @@ -9,7 +9,7 @@ 'use strict'; -var SyntheticMouseEvent = require('SyntheticMouseEvent'); +var SyntheticMouseEvent = require('./SyntheticMouseEvent'); /** * @interface WheelEvent diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js index 154cb8bae4ca..df517f4351dc 100644 --- a/packages/react-dom/src/events/TapEventPlugin.js +++ b/packages/react-dom/src/events/TapEventPlugin.js @@ -10,9 +10,9 @@ 'use strict'; -var EventPluginUtils = require('EventPluginUtils'); -var EventPropagators = require('EventPropagators'); -var SyntheticUIEvent = require('SyntheticUIEvent'); +var EventPluginUtils = require('shared/event/EventPluginUtils'); +var EventPropagators = require('shared/event/EventPropagators'); +var SyntheticUIEvent = require('../SyntheticUIEvent'); var TouchEventUtils = require('fbjs/lib/TouchEventUtils'); var isStartish = EventPluginUtils.isStartish; diff --git a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js index f073b0963a4f..b34db2e542aa 100644 --- a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js @@ -49,10 +49,10 @@ describe('BeforeInputEventPlugin', function() { this.ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - this.ReactDOMComponentTree = require('ReactDOMComponentTree'); - this.SyntheticCompositionEvent = require('SyntheticCompositionEvent'); - this.SyntheticInputEvent = require('SyntheticInputEvent'); - this.BeforeInputEventPlugin = require('BeforeInputEventPlugin'); + this.ReactDOMComponentTree = require('../../../ReactDOMComponentTree'); + this.SyntheticCompositionEvent = require('../../SyntheticCompositionEvent'); + this.SyntheticInputEvent = require('../../SyntheticInputEvent'); + this.BeforeInputEventPlugin = require('../BeforeInputEventPlugin'); } function extract(node, eventType, optionalData) { diff --git a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js index 15adf32e9986..9e88452f06fb 100644 --- a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js @@ -13,8 +13,8 @@ var React = require('react'); var ReactDOM = require('react-dom'); var ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? -var ChangeEventPlugin = require('ChangeEventPlugin'); -var inputValueTracking = require('inputValueTracking'); +var ChangeEventPlugin = require('../ChangeEventPlugin'); +var inputValueTracking = require('../../../inputValueTracking'); function getTrackedValue(elem) { var tracker = inputValueTracking._getTrackerFromNode(elem); diff --git a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js index c9bb7863a93c..cc261126d1c2 100644 --- a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js @@ -23,8 +23,8 @@ describe('EnterLeaveEventPlugin', () => { ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('ReactDOMComponentTree'); - EnterLeaveEventPlugin = require('EnterLeaveEventPlugin'); + ReactDOMComponentTree = require('../../../ReactDOMComponentTree'); + EnterLeaveEventPlugin = require('../EnterLeaveEventPlugin'); }); it('should set relatedTarget properly in iframe', () => { diff --git a/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js index 0f6149e25c12..36fdbdad9d60 100644 --- a/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js +++ b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js @@ -16,7 +16,7 @@ describe('FallbackCompositionState', () => { beforeEach(() => { // TODO: can we express this test with only public API? - FallbackCompositionState = require('FallbackCompositionState'); + FallbackCompositionState = require('../FallbackCompositionState'); }); function getInput() { diff --git a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js index bc118828f704..03c915f0defe 100644 --- a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js @@ -30,8 +30,8 @@ describe('SelectEventPlugin', () => { ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('ReactDOMComponentTree'); - SelectEventPlugin = require('SelectEventPlugin'); + ReactDOMComponentTree = require('../../../ReactDOMComponentTree'); + SelectEventPlugin = require('../SelectEventPlugin'); }); it('should skip extraction if no listeners are present', () => { diff --git a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js index f671f39a5ac9..b0e2f63a0494 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js @@ -16,9 +16,9 @@ describe('SyntheticClipboardEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticClipboardEvent = require('SyntheticClipboardEvent'); + SyntheticClipboardEvent = require('../SyntheticClipboardEvent'); createEvent = function(nativeEvent) { - var target = require('getEventTarget')(nativeEvent); + var target = require('../getEventTarget')(nativeEvent); return SyntheticClipboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js index 46ad876144f1..ccdfa79378ca 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js @@ -19,13 +19,13 @@ describe('SyntheticEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticEvent = require('SyntheticEvent'); + SyntheticEvent = require('../SyntheticEvent'); React = require('react'); ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); createEvent = function(nativeEvent) { - var target = require('getEventTarget')(nativeEvent); + var target = require('../getEventTarget')(nativeEvent); return SyntheticEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js index 4c510cc6f60a..ab3e40262079 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js @@ -17,13 +17,13 @@ describe('SyntheticKeyboardEvent', () => { beforeEach(() => { // Mock getEventCharCode for proper unit testing - jest.mock('getEventCharCode'); - getEventCharCode = require('getEventCharCode'); + jest.mock('../getEventCharCode'); + getEventCharCode = require('../getEventCharCode'); // TODO: can we express this test with only public API? - SyntheticKeyboardEvent = require('SyntheticKeyboardEvent'); + SyntheticKeyboardEvent = require('../SyntheticKeyboardEvent'); createEvent = function(nativeEvent) { - var target = require('getEventTarget')(nativeEvent); + var target = require('../getEventTarget')(nativeEvent); return SyntheticKeyboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js index 2da16b632ad2..229a93f68fe5 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js @@ -16,10 +16,10 @@ describe('SyntheticWheelEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticWheelEvent = require('SyntheticWheelEvent'); + SyntheticWheelEvent = require('../SyntheticWheelEvent'); createEvent = function(nativeEvent) { - var target = require('getEventTarget')(nativeEvent); + var target = require('../getEventTarget')(nativeEvent); return SyntheticWheelEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/getEventCharCode-test.js b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js index d6b3e0a46bce..3787151c4727 100644 --- a/packages/react-dom/src/events/__tests__/getEventCharCode-test.js +++ b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getEventCharCode = require('getEventCharCode'); +var getEventCharCode = require('../getEventCharCode'); describe('getEventCharCode', () => { describe('when charCode is present in nativeEvent', () => { diff --git a/packages/react-dom/src/events/__tests__/getEventKey-test.js b/packages/react-dom/src/events/__tests__/getEventKey-test.js index 9e48e2b72a93..4942911d4389 100644 --- a/packages/react-dom/src/events/__tests__/getEventKey-test.js +++ b/packages/react-dom/src/events/__tests__/getEventKey-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getEventKey = require('getEventKey'); +var getEventKey = require('../getEventKey'); describe('getEventKey', () => { describe('when key is implemented in a browser', () => { diff --git a/packages/react-dom/src/events/getEventKey.js b/packages/react-dom/src/events/getEventKey.js index 82408f8e1352..f4cad718470a 100644 --- a/packages/react-dom/src/events/getEventKey.js +++ b/packages/react-dom/src/events/getEventKey.js @@ -9,7 +9,7 @@ 'use strict'; -var getEventCharCode = require('getEventCharCode'); +var getEventCharCode = require('./getEventCharCode'); /** * Normalization of deprecated HTML5 `key` values diff --git a/packages/react-dom/src/events/getEventTarget.js b/packages/react-dom/src/events/getEventTarget.js index 6a02d239028e..64662285f142 100644 --- a/packages/react-dom/src/events/getEventTarget.js +++ b/packages/react-dom/src/events/getEventTarget.js @@ -9,7 +9,7 @@ 'use strict'; -var {TEXT_NODE} = require('HTMLNodeType'); +var {TEXT_NODE} = require('shared/HTMLNodeType'); /** * Gets the target node from a native browser event by accounting for diff --git a/packages/react-dom/src/server/DOMMarkupOperations.js b/packages/react-dom/src/server/DOMMarkupOperations.js index d2470493053d..b93305ac4b2f 100644 --- a/packages/react-dom/src/server/DOMMarkupOperations.js +++ b/packages/react-dom/src/server/DOMMarkupOperations.js @@ -9,9 +9,9 @@ 'use strict'; -var DOMProperty = require('DOMProperty'); +var DOMProperty = require('../shared/DOMProperty'); -var quoteAttributeValueForBrowser = require('quoteAttributeValueForBrowser'); +var quoteAttributeValueForBrowser = require('../shared/quoteAttributeValueForBrowser'); if (__DEV__) { var warning = require('fbjs/lib/warning'); diff --git a/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js b/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js index d3ff728ed221..acccaf664e61 100644 --- a/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js +++ b/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactPartialRenderer = require('ReactPartialRenderer'); +var ReactPartialRenderer = require('./ReactPartialRenderer'); var Readable = require('stream').Readable; // This is a Readable Node.js stream which wraps the ReactDOMPartialRenderer. diff --git a/packages/react-dom/src/server/ReactDOMServerBrowser.js b/packages/react-dom/src/server/ReactDOMServerBrowser.js index fa3557106f8b..c0c8e97facd6 100644 --- a/packages/react-dom/src/server/ReactDOMServerBrowser.js +++ b/packages/react-dom/src/server/ReactDOMServerBrowser.js @@ -7,11 +7,11 @@ 'use strict'; -var ReactDOMStringRenderer = require('ReactDOMStringRenderer'); -var ReactVersion = require('ReactVersion'); +var ReactDOMStringRenderer = require('./ReactDOMStringRenderer'); +var ReactVersion = require('shared/ReactVersion'); var invariant = require('fbjs/lib/invariant'); -require('ReactDOMInjection'); +require('../shared/ReactDOMInjection'); module.exports = { renderToString: ReactDOMStringRenderer.renderToString, diff --git a/packages/react-dom/src/server/ReactDOMServerNode.js b/packages/react-dom/src/server/ReactDOMServerNode.js index dbec2e1815aa..7b5e103ed2d7 100644 --- a/packages/react-dom/src/server/ReactDOMServerNode.js +++ b/packages/react-dom/src/server/ReactDOMServerNode.js @@ -7,11 +7,11 @@ 'use strict'; -var ReactDOMStringRenderer = require('ReactDOMStringRenderer'); -var ReactDOMNodeStreamRenderer = require('ReactDOMNodeStreamRenderer'); -var ReactVersion = require('ReactVersion'); +var ReactDOMStringRenderer = require('./ReactDOMStringRenderer'); +var ReactDOMNodeStreamRenderer = require('./ReactDOMNodeStreamRenderer'); +var ReactVersion = require('shared/ReactVersion'); -require('ReactDOMInjection'); +require('../shared/ReactDOMInjection'); module.exports = { renderToString: ReactDOMStringRenderer.renderToString, diff --git a/packages/react-dom/src/server/ReactDOMStringRenderer.js b/packages/react-dom/src/server/ReactDOMStringRenderer.js index f5571e449772..21e2318682bf 100644 --- a/packages/react-dom/src/server/ReactDOMStringRenderer.js +++ b/packages/react-dom/src/server/ReactDOMStringRenderer.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactPartialRenderer = require('ReactPartialRenderer'); +var ReactPartialRenderer = require('./ReactPartialRenderer'); /** * Render a ReactElement to its initial HTML. This should only be used on the diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js index d01feaebe198..705ddfd36a4f 100644 --- a/packages/react-dom/src/server/ReactPartialRenderer.js +++ b/packages/react-dom/src/server/ReactPartialRenderer.js @@ -13,21 +13,21 @@ var { Namespaces, getIntrinsicNamespace, getChildNamespace, -} = require('DOMNamespaces'); -var DOMMarkupOperations = require('DOMMarkupOperations'); +} = require('../shared/DOMNamespaces'); +var DOMMarkupOperations = require('./DOMMarkupOperations'); var React = require('react'); -var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes'); +var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); -var assertValidProps = require('assertValidProps'); -var dangerousStyleValue = require('dangerousStyleValue'); +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('escapeTextContentForBrowser'); +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('omittedCloseTags'); -var isCustomComponent = require('isCustomComponent'); +var omittedCloseTags = require('../shared/omittedCloseTags'); +var isCustomComponent = require('../shared/isCustomComponent'); var toArray = React.Children.toArray; var getStackAddendum = emptyFunction.thatReturns(''); @@ -35,23 +35,23 @@ var getStackAddendum = emptyFunction.thatReturns(''); if (__DEV__) { var warning = require('fbjs/lib/warning'); var checkPropTypes = require('prop-types/checkPropTypes'); - var warnValidStyle = require('warnValidStyle'); + var warnValidStyle = require('../shared/warnValidStyle'); var { validateProperties: validateARIAProperties, - } = require('ReactDOMInvalidARIAHook'); + } = require('../shared/ReactDOMInvalidARIAHook'); var { validateProperties: validateInputProperties, - } = require('ReactDOMNullInputValuePropHook'); + } = require('../shared/ReactDOMNullInputValuePropHook'); var { validateProperties: validateUnknownProperties, - } = require('ReactDOMUnknownPropertyHook'); + } = require('../shared/ReactDOMUnknownPropertyHook'); var validatePropertiesInDevelopment = function(type, props) { validateARIAProperties(type, props); validateInputProperties(type, props); validateUnknownProperties(type, props); }; - var describeComponentFrame = require('describeComponentFrame'); + var describeComponentFrame = require('shared/describeComponentFrame'); var describeStackFrame = function(element): string { var source = element._source; var type = element.type; @@ -60,7 +60,7 @@ if (__DEV__) { return describeComponentFrame(name, source, ownerName); }; - var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState'); + var {ReactDebugCurrentFrame} = require('shared/ReactGlobalSharedState'); var currentDebugStack = null; var currentDebugElementStack = null; var setCurrentDebugStack = function(stack) { diff --git a/packages/react-dom/src/shared/CSSPropertyOperations.js b/packages/react-dom/src/shared/CSSPropertyOperations.js index 4fea94c13a0f..1603ec045985 100644 --- a/packages/react-dom/src/shared/CSSPropertyOperations.js +++ b/packages/react-dom/src/shared/CSSPropertyOperations.js @@ -9,11 +9,11 @@ 'use strict'; -var dangerousStyleValue = require('dangerousStyleValue'); +var dangerousStyleValue = require('./dangerousStyleValue'); if (__DEV__) { var hyphenateStyleName = require('fbjs/lib/hyphenateStyleName'); - var warnValidStyle = require('warnValidStyle'); + var warnValidStyle = require('./warnValidStyle'); } /** diff --git a/packages/react-dom/src/shared/HTMLDOMPropertyConfig.js b/packages/react-dom/src/shared/HTMLDOMPropertyConfig.js index 45a3669fa6f8..aace46cd35fe 100644 --- a/packages/react-dom/src/shared/HTMLDOMPropertyConfig.js +++ b/packages/react-dom/src/shared/HTMLDOMPropertyConfig.js @@ -9,7 +9,7 @@ 'use strict'; -var DOMProperty = require('DOMProperty'); +var DOMProperty = require('./DOMProperty'); var MUST_USE_PROPERTY = DOMProperty.injection.MUST_USE_PROPERTY; var HAS_BOOLEAN_VALUE = DOMProperty.injection.HAS_BOOLEAN_VALUE; diff --git a/packages/react-dom/src/shared/ReactDOMInjection.js b/packages/react-dom/src/shared/ReactDOMInjection.js index 05608a75e81a..f27f34a0c86d 100644 --- a/packages/react-dom/src/shared/ReactDOMInjection.js +++ b/packages/react-dom/src/shared/ReactDOMInjection.js @@ -9,9 +9,9 @@ 'use strict'; -var DOMProperty = require('DOMProperty'); -var HTMLDOMPropertyConfig = require('HTMLDOMPropertyConfig'); -var SVGDOMPropertyConfig = require('SVGDOMPropertyConfig'); +var DOMProperty = require('./DOMProperty'); +var HTMLDOMPropertyConfig = require('./HTMLDOMPropertyConfig'); +var SVGDOMPropertyConfig = require('./SVGDOMPropertyConfig'); DOMProperty.injection.injectDOMPropertyConfig(HTMLDOMPropertyConfig); DOMProperty.injection.injectDOMPropertyConfig(SVGDOMPropertyConfig); diff --git a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js index d54d0e787883..9ce78e7d8095 100644 --- a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js +++ b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js @@ -9,8 +9,8 @@ 'use strict'; -var DOMProperty = require('DOMProperty'); -var isCustomComponent = require('isCustomComponent'); +var DOMProperty = require('./DOMProperty'); +var isCustomComponent = require('./isCustomComponent'); var warnedProperties = {}; var rARIA = new RegExp('^(aria)-[' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$'); diff --git a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js index 74ddf2b88893..27b781719bd3 100644 --- a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js +++ b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js @@ -11,7 +11,7 @@ if (__DEV__) { var warning = require('fbjs/lib/warning'); - var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState'); + var {ReactDebugCurrentFrame} = require('shared/ReactGlobalSharedState'); } var didWarnValueNull = false; diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js index 3fb07e4ca9c7..81959d2c7801 100644 --- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js +++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js @@ -9,13 +9,13 @@ 'use strict'; -var DOMProperty = require('DOMProperty'); -var EventPluginRegistry = require('EventPluginRegistry'); -var isCustomComponent = require('isCustomComponent'); +var DOMProperty = require('./DOMProperty'); +var EventPluginRegistry = require('shared/event/EventPluginRegistry'); +var isCustomComponent = require('./isCustomComponent'); if (__DEV__) { var warning = require('fbjs/lib/warning'); - var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState'); + var {ReactDebugCurrentFrame} = require('shared/ReactGlobalSharedState'); } function getStackAddendum() { diff --git a/packages/react-dom/src/shared/SVGDOMPropertyConfig.js b/packages/react-dom/src/shared/SVGDOMPropertyConfig.js index 6d45eb15bb6c..40bf9a030daf 100644 --- a/packages/react-dom/src/shared/SVGDOMPropertyConfig.js +++ b/packages/react-dom/src/shared/SVGDOMPropertyConfig.js @@ -9,7 +9,7 @@ 'use strict'; -var DOMProperty = require('DOMProperty'); +var DOMProperty = require('./DOMProperty'); var {HAS_STRING_BOOLEAN_VALUE} = DOMProperty.injection; diff --git a/packages/react-dom/src/shared/assertValidProps.js b/packages/react-dom/src/shared/assertValidProps.js index 2efa70d4da57..bb738f41e497 100644 --- a/packages/react-dom/src/shared/assertValidProps.js +++ b/packages/react-dom/src/shared/assertValidProps.js @@ -10,7 +10,7 @@ 'use strict'; var invariant = require('fbjs/lib/invariant'); -var voidElementTags = require('voidElementTags'); +var voidElementTags = require('./voidElementTags'); if (__DEV__) { var warning = require('fbjs/lib/warning'); diff --git a/packages/react-dom/src/shared/dangerousStyleValue.js b/packages/react-dom/src/shared/dangerousStyleValue.js index 0da1044febb3..65e0b09d7b3a 100644 --- a/packages/react-dom/src/shared/dangerousStyleValue.js +++ b/packages/react-dom/src/shared/dangerousStyleValue.js @@ -9,7 +9,7 @@ 'use strict'; -var CSSProperty = require('CSSProperty'); +var CSSProperty = require('./CSSProperty'); var isUnitlessNumber = CSSProperty.isUnitlessNumber; diff --git a/packages/react-dom/src/shared/quoteAttributeValueForBrowser.js b/packages/react-dom/src/shared/quoteAttributeValueForBrowser.js index 9fae79031c33..c0da9a2c1db3 100644 --- a/packages/react-dom/src/shared/quoteAttributeValueForBrowser.js +++ b/packages/react-dom/src/shared/quoteAttributeValueForBrowser.js @@ -9,7 +9,7 @@ 'use strict'; -var escapeTextContentForBrowser = require('escapeTextContentForBrowser'); +var escapeTextContentForBrowser = require('./escapeTextContentForBrowser'); /** * Escapes attribute value to prevent scripting attacks. diff --git a/packages/react-dom/src/shared/voidElementTags.js b/packages/react-dom/src/shared/voidElementTags.js index 5bd717c4fb8c..87ff6839d41d 100644 --- a/packages/react-dom/src/shared/voidElementTags.js +++ b/packages/react-dom/src/shared/voidElementTags.js @@ -9,7 +9,7 @@ 'use strict'; -var omittedCloseTags = require('omittedCloseTags'); +var omittedCloseTags = require('./omittedCloseTags'); // For HTML, certain tags cannot have children. This has the same purpose as // `omittedCloseTags` except that `menuitem` should still have its closing tag. diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js index 4292897a46b0..3667b62732b1 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtils.js +++ b/packages/react-dom/src/test-utils/ReactTestUtils.js @@ -7,13 +7,13 @@ 'use strict'; -var BrowserEventConstants = require('BrowserEventConstants'); +var BrowserEventConstants = require('shared/event/BrowserEventConstants'); var React = require('react'); var ReactDOM = require('react-dom'); -var ReactFiberTreeReflection = require('ReactFiberTreeReflection'); -var ReactInstanceMap = require('ReactInstanceMap'); -var ReactTypeOfWork = require('ReactTypeOfWork'); -var SyntheticEvent = require('SyntheticEvent'); +var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); +var ReactInstanceMap = require('shared/ReactInstanceMap'); +var ReactTypeOfWork = require('shared/ReactTypeOfWork'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js b/packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js index 046fc60f77d1..659616bc8313 100644 --- a/packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js +++ b/packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -const EventPluginUtils = require('EventPluginUtils'); -const ResponderEventPlugin = require('ResponderEventPlugin'); -const ResponderTouchHistoryStore = require('ResponderTouchHistoryStore'); +const EventPluginUtils = require('shared/event/EventPluginUtils'); +const ResponderEventPlugin = require('shared/event/plugins/ResponderEventPlugin'); +const ResponderTouchHistoryStore = require('shared/event/plugins/ResponderTouchHistoryStore'); // This is used by react-native-web. const ReactDOMUnstableNativeDependencies = { diff --git a/packages/react-native-renderer/src/NativeMethodsMixin.js b/packages/react-native-renderer/src/NativeMethodsMixin.js index 840c952f5005..0a655ea2530e 100644 --- a/packages/react-native-renderer/src/NativeMethodsMixin.js +++ b/packages/react-native-renderer/src/NativeMethodsMixin.js @@ -9,19 +9,21 @@ */ 'use strict'; -const ReactNativeAttributePayload = require('ReactNativeAttributePayload'); +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 findNodeHandle = require('./findNodeHandle'); +const findNumericNodeHandle = require('./findNumericNodeHandle'); const { mountSafeCallback, throwOnStylesProp, warnForStyleProps, -} = require('NativeMethodsMixinUtils'); +} = require('./NativeMethodsMixinUtils'); import type { MeasureInWindowOnSuccessCallback, diff --git a/packages/react-native-renderer/src/ReactNativeAttributePayload.js b/packages/react-native-renderer/src/ReactNativeAttributePayload.js index 9dcf54b654f5..d9ebf4bec047 100644 --- a/packages/react-native-renderer/src/ReactNativeAttributePayload.js +++ b/packages/react-native-renderer/src/ReactNativeAttributePayload.js @@ -9,8 +9,9 @@ */ 'use strict'; -var ReactNativePropRegistry = require('ReactNativePropRegistry'); +var ReactNativePropRegistry = require('./ReactNativePropRegistry'); +// Module provided by RN: var deepDiffer = require('deepDiffer'); var flattenStyle = require('flattenStyle'); diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js index 089c6b1591ba..cda487830a8f 100644 --- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js +++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js @@ -9,8 +9,8 @@ */ 'use strict'; -const EventPropagators = require('EventPropagators'); -const SyntheticEvent = require('SyntheticEvent'); +const EventPropagators = require('shared/event/EventPropagators'); +const SyntheticEvent = require('shared/event/SyntheticEvent'); const invariant = require('fbjs/lib/invariant'); const customBubblingEventTypes = {}; diff --git a/packages/react-native-renderer/src/ReactNativeComponent.js b/packages/react-native-renderer/src/ReactNativeComponent.js index 5399171bfed9..be8bb6a60c69 100644 --- a/packages/react-native-renderer/src/ReactNativeComponent.js +++ b/packages/react-native-renderer/src/ReactNativeComponent.js @@ -12,14 +12,16 @@ 'use strict'; const React = require('react'); -const ReactNativeAttributePayload = require('ReactNativeAttributePayload'); +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 findNodeHandle = require('./findNodeHandle'); +const findNumericNodeHandle = require('./findNumericNodeHandle'); -const {mountSafeCallback} = require('NativeMethodsMixinUtils'); +const {mountSafeCallback} = require('./NativeMethodsMixinUtils'); import type { MeasureInWindowOnSuccessCallback, diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js index 7ba69efdb8df..6aa7ef092e92 100644 --- a/packages/react-native-renderer/src/ReactNativeEventEmitter.js +++ b/packages/react-native-renderer/src/ReactNativeEventEmitter.js @@ -9,12 +9,12 @@ */ 'use strict'; -var EventPluginHub = require('EventPluginHub'); -var EventPluginRegistry = require('EventPluginRegistry'); -var ReactEventEmitterMixin = require('ReactEventEmitterMixin'); -var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var ReactNativeTagHandles = require('ReactNativeTagHandles'); -var ReactGenericBatching = require('ReactGenericBatching'); +var EventPluginHub = require('shared/event/EventPluginHub'); +var EventPluginRegistry = require('shared/event/EventPluginRegistry'); +var ReactEventEmitterMixin = require('shared/event/ReactEventEmitterMixin'); +var ReactNativeComponentTree = require('./ReactNativeComponentTree'); +var ReactNativeTagHandles = require('./ReactNativeTagHandles'); +var ReactGenericBatching = require('shared/event/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 69dc88149b7e..6ae6ba77dc5f 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js +++ b/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js @@ -10,6 +10,7 @@ 'use strict'; +// Module provided by RN: const ExceptionsManager = require('ExceptionsManager'); import type {CapturedError} from 'ReactFiberScheduler'; diff --git a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js index 28371213ebe0..5716b5ba44be 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js +++ b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js @@ -10,11 +10,13 @@ 'use strict'; -var ReactNativeAttributePayload = require('ReactNativeAttributePayload'); +var ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); + +// Modules provided by RN: var TextInputState = require('TextInputState'); var UIManager = require('UIManager'); -var {mountSafeCallback, warnForStyleProps} = require('NativeMethodsMixinUtils'); +var {mountSafeCallback, warnForStyleProps} = require('./NativeMethodsMixinUtils'); import type { MeasureInWindowOnSuccessCallback, diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js index b88e225fbcb9..8206a9fa7c4e 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js +++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js @@ -9,14 +9,16 @@ */ 'use strict'; -const ReactNativeComponentTree = require('ReactNativeComponentTree'); -const ReactFiberTreeReflection = require('ReactFiberTreeReflection'); -const getComponentName = require('getComponentName'); +const ReactNativeComponentTree = require('./ReactNativeComponentTree'); +const ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); +const getComponentName = require('shared/getComponentName'); const emptyObject = require('fbjs/lib/emptyObject'); -const ReactTypeOfWork = require('ReactTypeOfWork'); -const UIManager = require('UIManager'); +const ReactTypeOfWork = require('shared/ReactTypeOfWork'); const invariant = require('fbjs/lib/invariant'); +// Module provided by RN: +const UIManager = require('UIManager'); + const {getClosestInstanceFromNode} = ReactNativeComponentTree; const {findCurrentFiberUsingSlowPath} = ReactFiberTreeReflection; const {HostComponent} = ReactTypeOfWork; diff --git a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js index fdb0918c293e..2c198b077f91 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js @@ -11,14 +11,16 @@ 'use strict'; const ReactFiberReconciler = require('react-reconciler'); -const ReactNativeAttributePayload = require('ReactNativeAttributePayload'); -const ReactNativeComponentTree = require('ReactNativeComponentTree'); -const ReactNativeFiberHostComponent = require('ReactNativeFiberHostComponent'); -const ReactNativeTagHandles = require('ReactNativeTagHandles'); -const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry'); -const UIManager = require('UIManager'); +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'); diff --git a/packages/react-native-renderer/src/ReactNativeGlobalResponderHandler.js b/packages/react-native-renderer/src/ReactNativeGlobalResponderHandler.js index 84104c6a62b6..aefccfb0a4b0 100644 --- a/packages/react-native-renderer/src/ReactNativeGlobalResponderHandler.js +++ b/packages/react-native-renderer/src/ReactNativeGlobalResponderHandler.js @@ -8,6 +8,7 @@ */ 'use strict'; +// Module provided by RN: var UIManager = require('UIManager'); var ReactNativeGlobalResponderHandler = { diff --git a/packages/react-native-renderer/src/ReactNativeInjection.js b/packages/react-native-renderer/src/ReactNativeInjection.js index 4c8d5b56786d..793b43352ee0 100644 --- a/packages/react-native-renderer/src/ReactNativeInjection.js +++ b/packages/react-native-renderer/src/ReactNativeInjection.js @@ -15,17 +15,19 @@ * ensures it exists in the dependency graph and can be `require`d. * TODO: require this in packager, not in React #10932517 */ + // Module provided by RN: require('InitializeCore'); -var EventPluginHub = require('EventPluginHub'); -var EventPluginUtils = require('EventPluginUtils'); +var EventPluginHub = require('shared/event/EventPluginHub'); +var EventPluginUtils = require('shared/event/EventPluginUtils'); +// 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('ResponderEventPlugin'); +var ReactNativeBridgeEventPlugin = require('./ReactNativeBridgeEventPlugin'); +var ReactNativeComponentTree = require('./ReactNativeComponentTree'); +var ReactNativeEventEmitter = require('./ReactNativeEventEmitter'); +var ReactNativeEventPluginOrder = require('./ReactNativeEventPluginOrder'); +var ReactNativeGlobalResponderHandler = require('./ReactNativeGlobalResponderHandler'); +var ResponderEventPlugin = require('shared/event/plugins/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 a9724e5416c5..10e391259c22 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -9,19 +9,22 @@ 'use strict'; -const ReactFiberErrorLogger = require('ReactFiberErrorLogger'); -const ReactGenericBatching = require('ReactGenericBatching'); -const ReactNativeFiberErrorDialog = require('ReactNativeFiberErrorDialog'); -const ReactPortal = require('ReactPortal'); -const ReactNativeComponentTree = require('ReactNativeComponentTree'); -const ReactNativeFiberRenderer = require('ReactNativeFiberRenderer'); -const ReactNativeFiberInspector = require('ReactNativeFiberInspector'); -const ReactVersion = require('ReactVersion'); +// TODO: direct imports like some-package/src/* are bad. Fix me. +const ReactFiberErrorLogger = require('react-reconciler/src/ReactFiberErrorLogger'); +const ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); +const {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); + +const ReactGenericBatching = require('shared/event/ReactGenericBatching'); +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'); - -const {injectInternals} = require('ReactFiberDevToolsHook'); +const findNumericNodeHandle = require('./findNumericNodeHandle'); import type {ReactNativeType} from 'ReactNativeTypes'; import type {ReactNodeList} from 'ReactTypes'; diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js index 3f8c50b5b8ae..99135d8b570e 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js @@ -7,8 +7,8 @@ */ 'use strict'; -var ReactNativeAttributePayload = require('ReactNativeAttributePayload'); -var ReactNativePropRegistry = require('ReactNativePropRegistry'); +var ReactNativeAttributePayload = require('../ReactNativeAttributePayload'); +var ReactNativePropRegistry = require('../ReactNativePropRegistry'); var diff = ReactNativeAttributePayload.diff; diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js index c25818f2dc25..3beeb5f439bf 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js @@ -69,10 +69,10 @@ beforeEach(() => { RCTEventEmitter = require('RCTEventEmitter'); React = require('react'); ReactNative = require('react-native-renderer'); - ReactNativeBridgeEventPlugin = require('ReactNativeBridgeEventPlugin'); - ResponderEventPlugin = require('ResponderEventPlugin'); + ReactNativeBridgeEventPlugin = require('../ReactNativeBridgeEventPlugin'); + ResponderEventPlugin = require('shared/event/plugins/ResponderEventPlugin'); UIManager = require('UIManager'); - createReactNativeComponentClass = require('createReactNativeComponentClass'); + createReactNativeComponentClass = require('../createReactNativeComponentClass'); }); it('fails if unknown/unsupported event types are dispatched', () => { diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js index 782bb310cbf1..8f6e5b63326b 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js @@ -21,7 +21,7 @@ describe('ReactNative', () => { React = require('react'); ReactNative = require('react-native-renderer'); UIManager = require('UIManager'); - createReactNativeComponentClass = require('createReactNativeComponentClass'); + createReactNativeComponentClass = require('../createReactNativeComponentClass'); }); it('should be able to create and render a native component', () => { diff --git a/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js b/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js index 1ac08508d59c..aba3b8acc286 100644 --- a/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js +++ b/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js @@ -17,7 +17,7 @@ describe('createReactNativeComponentClass', () => { beforeEach(() => { jest.resetModules(); - createReactNativeComponentClass = require('createReactNativeComponentClass'); + createReactNativeComponentClass = require('../createReactNativeComponentClass'); React = require('react'); ReactNative = require('react-native-renderer'); }); diff --git a/packages/react-native-renderer/src/createReactNativeComponentClass.js b/packages/react-native-renderer/src/createReactNativeComponentClass.js index dc27698d4616..430ef606915b 100644 --- a/packages/react-native-renderer/src/createReactNativeComponentClass.js +++ b/packages/react-native-renderer/src/createReactNativeComponentClass.js @@ -10,7 +10,7 @@ 'use strict'; -const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry'); +const ReactNativeViewConfigRegistry = require('./ReactNativeViewConfigRegistry'); import type {ViewConfigGetter} from 'ReactNativeTypes'; diff --git a/packages/react-native-renderer/src/findNodeHandle.js b/packages/react-native-renderer/src/findNodeHandle.js index 2098da550b5a..f74b078f57d8 100644 --- a/packages/react-native-renderer/src/findNodeHandle.js +++ b/packages/react-native-renderer/src/findNodeHandle.js @@ -10,10 +10,10 @@ 'use strict'; -var ReactInstanceMap = require('ReactInstanceMap'); -var ReactNativeFiberRenderer = require('ReactNativeFiberRenderer'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); -var getComponentName = require('getComponentName'); +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'); if (__DEV__) { diff --git a/packages/react-native-renderer/src/findNumericNodeHandle.js b/packages/react-native-renderer/src/findNumericNodeHandle.js index 11c5eacf134e..1d49f7f7cb3d 100644 --- a/packages/react-native-renderer/src/findNumericNodeHandle.js +++ b/packages/react-native-renderer/src/findNumericNodeHandle.js @@ -9,7 +9,7 @@ */ 'use strict'; -var findNodeHandle = require('findNodeHandle'); +var findNodeHandle = require('./findNodeHandle'); /** * External users of findNodeHandle() expect the host tag number return type. diff --git a/packages/react-native-renderer/src/takeSnapshot.js b/packages/react-native-renderer/src/takeSnapshot.js index be46aa52464f..8df0ea2de97c 100644 --- a/packages/react-native-renderer/src/takeSnapshot.js +++ b/packages/react-native-renderer/src/takeSnapshot.js @@ -9,9 +9,10 @@ */ 'use strict'; +// Module provided by RN: const UIManager = require('UIManager'); -const findNumericNodeHandle = require('findNumericNodeHandle'); +const findNumericNodeHandle = require('./findNumericNodeHandle'); /** * Capture an image of the screen, window or an individual view. The image diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js index b49705adbd73..b40731963e76 100644 --- a/packages/react-noop-renderer/src/ReactNoop.js +++ b/packages/react-noop-renderer/src/ReactNoop.js @@ -20,10 +20,11 @@ import type {Fiber} from 'ReactFiber'; import type {UpdateQueue} from 'ReactFiberUpdateQueue'; -var ReactFeatureFlags = require('ReactFeatureFlags'); -var ReactFiberInstrumentation = require('ReactFiberInstrumentation'); +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 ReactInstanceMap = require('ReactInstanceMap'); +var ReactInstanceMap = require('shared/ReactInstanceMap'); var emptyObject = require('fbjs/lib/emptyObject'); var expect = require('jest-matchers'); diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 2aab280dde63..31ccc4e095d0 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -15,18 +15,18 @@ import type {ReactCoroutine, ReactPortal, ReactYield} from 'ReactTypes'; import type {Fiber} from 'ReactFiber'; import type {ExpirationTime} from 'ReactFiberExpirationTime'; -var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('ReactCoroutine'); -var {REACT_PORTAL_TYPE} = require('ReactPortal'); +var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('./isomorphic/ReactCoroutine'); +var {REACT_PORTAL_TYPE} = require('./isomorphic/ReactPortal'); -var ReactFiber = require('ReactFiber'); -var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect'); -var ReactTypeOfWork = require('ReactTypeOfWork'); +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'); if (__DEV__) { - var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber'); + var {getCurrentFiberStackAddendum} = require('./ReactDebugCurrentFiber'); var warning = require('fbjs/lib/warning'); var didWarnAboutMaps = false; /** diff --git a/packages/react-reconciler/src/ReactDebugCurrentFiber.js b/packages/react-reconciler/src/ReactDebugCurrentFiber.js index 92b3fa26f144..80a8e6f7f37f 100644 --- a/packages/react-reconciler/src/ReactDebugCurrentFiber.js +++ b/packages/react-reconciler/src/ReactDebugCurrentFiber.js @@ -14,13 +14,13 @@ import type {Fiber} from 'ReactFiber'; type LifeCyclePhase = 'render' | 'getChildContext'; -var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState'); +var {ReactDebugCurrentFrame} = require('shared/ReactGlobalSharedState'); if (__DEV__) { - var getComponentName = require('getComponentName'); + var getComponentName = require('shared/getComponentName'); var { getStackAddendumByWorkInProgressFiber, - } = require('ReactFiberComponentTreeHook'); + } = require('shared/ReactFiberComponentTreeHook'); } function getCurrentFiberOwnerName(): string | null { diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js index 2d41a1e4655a..d88142eaad53 100644 --- a/packages/react-reconciler/src/ReactDebugFiberPerf.js +++ b/packages/react-reconciler/src/ReactDebugFiberPerf.js @@ -31,9 +31,9 @@ if (__DEV__) { HostPortal, YieldComponent, Fragment, - } = require('ReactTypeOfWork'); + } = require('shared/ReactTypeOfWork'); - const getComponentName = require('getComponentName'); + const getComponentName = require('shared/getComponentName'); // Prefix measurements so that it's possible to filter them. // Longer prefixes are hard to read in DevTools. diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index 18e4a984a3f3..047b90dcfd9b 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -33,18 +33,18 @@ var { CoroutineComponent, YieldComponent, Fragment, -} = require('ReactTypeOfWork'); +} = require('shared/ReactTypeOfWork'); -var {NoWork} = require('ReactFiberExpirationTime'); +var {NoWork} = require('./ReactFiberExpirationTime'); -var {NoContext} = require('ReactTypeOfInternalContext'); +var {NoContext} = require('./ReactTypeOfInternalContext'); -var {NoEffect} = require('ReactTypeOfSideEffect'); +var {NoEffect} = require('shared/ReactTypeOfSideEffect'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { - var getComponentName = require('getComponentName'); + 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 a36d40b67ef9..dc43cb262b3e 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -23,9 +23,9 @@ var { reconcileChildFibers, reconcileChildFibersInPlace, cloneChildFibers, -} = require('ReactChildFiber'); -var {processUpdateQueue} = require('ReactFiberUpdateQueue'); -var ReactTypeOfWork = require('ReactTypeOfWork'); +} = require('./ReactChildFiber'); +var {processUpdateQueue} = require('./ReactFiberUpdateQueue'); +var ReactTypeOfWork = require('shared/ReactTypeOfWork'); var { getMaskedContext, getUnmaskedContext, @@ -33,7 +33,7 @@ var { pushContextProvider, pushTopLevelContextObject, invalidateContextProvider, -} = require('ReactFiberContext'); +} = require('./ReactFiberContext'); var { IndeterminateComponent, FunctionalComponent, @@ -47,21 +47,21 @@ var { YieldComponent, Fragment, } = ReactTypeOfWork; -var {NoWork, Never} = require('ReactFiberExpirationTime'); +var {NoWork, Never} = require('./ReactFiberExpirationTime'); var { PerformedWork, Placement, ContentReset, Err, Ref, -} = require('ReactTypeOfSideEffect'); -var ReactFiberClassComponent = require('ReactFiberClassComponent'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); +} = require('shared/ReactTypeOfSideEffect'); +var ReactFiberClassComponent = require('./ReactFiberClassComponent'); +var {ReactCurrentOwner} = require('shared/ReactGlobalSharedState'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { - var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber'); - var {cancelWorkTimer} = require('ReactDebugFiberPerf'); + 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 a9464b1af2df..6d7b85f9863d 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.js +++ b/packages/react-reconciler/src/ReactFiberClassComponent.js @@ -13,26 +13,26 @@ import type {Fiber} from 'ReactFiber'; import type {ExpirationTime} from 'ReactFiberExpirationTime'; -var {Update} = require('ReactTypeOfSideEffect'); +var {Update} = require('shared/ReactTypeOfSideEffect'); -var ReactFeatureFlags = require('ReactFeatureFlags'); -var {AsyncUpdates} = require('ReactTypeOfInternalContext'); +var ReactFeatureFlags = require('shared/ReactFeatureFlags'); +var {AsyncUpdates} = require('./ReactTypeOfInternalContext'); var { cacheContext, getMaskedContext, getUnmaskedContext, isContextConsumer, -} = require('ReactFiberContext'); +} = require('./ReactFiberContext'); var { insertUpdateIntoFiber, processUpdateQueue, -} = require('ReactFiberUpdateQueue'); -var {hasContextChanged} = require('ReactFiberContext'); -var {isMounted} = require('ReactFiberTreeReflection'); -var ReactInstanceMap = require('ReactInstanceMap'); +} = 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('getComponentName'); +var getComponentName = require('shared/getComponentName'); var shallowEqual = require('fbjs/lib/shallowEqual'); var invariant = require('fbjs/lib/invariant'); @@ -40,7 +40,7 @@ const fakeInternalInstance = {}; const isArray = Array.isArray; if (__DEV__) { - var {startPhaseTimer, stopPhaseTimer} = require('ReactDebugFiberPerf'); + var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); var warning = require('fbjs/lib/warning'); var warnOnInvalidCallback = function(callback: mixed, callerName: string) { warning( diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index 5ad88d78935c..b1f5d25196a0 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -13,8 +13,8 @@ import type {HostConfig} from 'react-reconciler'; import type {Fiber} from 'ReactFiber'; -var ReactFeatureFlags = require('ReactFeatureFlags'); -var ReactTypeOfWork = require('ReactTypeOfWork'); +var ReactFeatureFlags = require('shared/ReactFeatureFlags'); +var ReactTypeOfWork = require('shared/ReactTypeOfWork'); var { ClassComponent, HostRoot, @@ -23,20 +23,20 @@ var { HostPortal, CoroutineComponent, } = ReactTypeOfWork; -var {commitCallbacks} = require('ReactFiberUpdateQueue'); -var {onCommitUnmount} = require('ReactFiberDevToolsHook'); +var {commitCallbacks} = require('./ReactFiberUpdateQueue'); +var {onCommitUnmount} = require('./ReactFiberDevToolsHook'); var { invokeGuardedCallback, hasCaughtError, clearCaughtError, -} = require('ReactErrorUtils'); +} = require('shared/ReactErrorUtils'); -var {Placement, Update, ContentReset} = require('ReactTypeOfSideEffect'); +var {Placement, Update, ContentReset} = require('shared/ReactTypeOfSideEffect'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { - var {startPhaseTimer, stopPhaseTimer} = require('ReactDebugFiberPerf'); + var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); } module.exports = function( diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index cb252756678d..18a46d63e8dc 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -18,15 +18,15 @@ import type {HostContext} from 'ReactFiberHostContext'; import type {HydrationContext} from 'ReactFiberHydrationContext'; import type {FiberRoot} from 'ReactFiberRoot'; -var {reconcileChildFibers} = require('ReactChildFiber'); +var {reconcileChildFibers} = require('./ReactChildFiber'); var { popContextProvider, popTopLevelContextObject, -} = require('ReactFiberContext'); -var ReactFeatureFlags = require('ReactFeatureFlags'); -var ReactTypeOfWork = require('ReactTypeOfWork'); -var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect'); -var ReactFiberExpirationTime = require('ReactFiberExpirationTime'); +} = require('./ReactFiberContext'); +var ReactFeatureFlags = require('shared/ReactFeatureFlags'); +var ReactTypeOfWork = require('shared/ReactTypeOfWork'); +var ReactTypeOfSideEffect = require('./ReactTypeOfSideEffect'); +var ReactFiberExpirationTime = require('./ReactFiberExpirationTime'); var { IndeterminateComponent, FunctionalComponent, diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js index 8c5bb9652617..6c5aa897a594 100644 --- a/packages/react-reconciler/src/ReactFiberContext.js +++ b/packages/react-reconciler/src/ReactFiberContext.js @@ -14,17 +14,17 @@ import type {Fiber} from 'ReactFiber'; import type {StackCursor} from 'ReactFiberStack'; var emptyObject = require('fbjs/lib/emptyObject'); -var getComponentName = require('getComponentName'); +var getComponentName = require('shared/getComponentName'); var invariant = require('fbjs/lib/invariant'); -var {isFiberMounted} = require('ReactFiberTreeReflection'); -var {ClassComponent, HostRoot} = require('ReactTypeOfWork'); -const {createCursor, pop, push} = require('ReactFiberStack'); +var {isFiberMounted} = require('shared/ReactFiberTreeReflection'); +var {ClassComponent, HostRoot} = require('shared/ReactTypeOfWork'); +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 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 c4aa2abc5e40..527b6e1d5c65 100644 --- a/packages/react-reconciler/src/ReactFiberErrorLogger.js +++ b/packages/react-reconciler/src/ReactFiberErrorLogger.js @@ -12,7 +12,7 @@ const invariant = require('fbjs/lib/invariant'); -import type {CapturedError} from 'ReactFiberScheduler'; +import type {CapturedError} from './ReactFiberScheduler'; const defaultShowDialog = (capturedError: CapturedError) => true; diff --git a/packages/react-reconciler/src/ReactFiberHostContext.js b/packages/react-reconciler/src/ReactFiberHostContext.js index 0612d8e1b419..d29ec32896a8 100644 --- a/packages/react-reconciler/src/ReactFiberHostContext.js +++ b/packages/react-reconciler/src/ReactFiberHostContext.js @@ -14,7 +14,7 @@ import type {HostConfig} from 'react-reconciler'; import type {Fiber} from 'ReactFiber'; import type {StackCursor} from 'ReactFiberStack'; -const {createCursor, pop, push} = require('ReactFiberStack'); +const {createCursor, pop, push} = require('./ReactFiberStack'); const invariant = require('fbjs/lib/invariant'); diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js index 367f0ad71743..2f55f948d2a9 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js @@ -15,10 +15,10 @@ import type {Fiber} from 'ReactFiber'; var invariant = require('fbjs/lib/invariant'); -const {HostComponent, HostText, HostRoot} = require('ReactTypeOfWork'); -const {Deletion, Placement} = require('ReactTypeOfSideEffect'); +const {HostComponent, HostText, HostRoot} = require('shared/ReactTypeOfWork'); +const {Deletion, Placement} = require('shared/ReactTypeOfSideEffect'); -const {createFiberFromHostInstanceForDeletion} = require('ReactFiber'); +const {createFiberFromHostInstanceForDeletion} = require('./ReactFiber'); export type HydrationContext = { enterHydrationState(fiber: Fiber): boolean, diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index 1310189b0436..66ea0ebc91b4 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -13,24 +13,24 @@ import type {Fiber} from 'ReactFiber'; import type {FiberRoot} from 'ReactFiberRoot'; import type {ReactNodeList} from 'ReactTypes'; -var ReactFeatureFlags = require('ReactFeatureFlags'); +var ReactFeatureFlags = require('shared/ReactFeatureFlags'); var { findCurrentUnmaskedContext, isContextProvider, processChildContext, -} = require('ReactFiberContext'); -var {createFiberRoot} = require('ReactFiberRoot'); -var ReactFiberScheduler = require('ReactFiberScheduler'); -var ReactInstanceMap = require('ReactInstanceMap'); -var {HostComponent} = require('ReactTypeOfWork'); -var {insertUpdateIntoFiber} = require('ReactFiberUpdateQueue'); +} = 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 warning = require('fbjs/lib/warning'); - var ReactFiberInstrumentation = require('ReactFiberInstrumentation'); - var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber'); - var getComponentName = require('getComponentName'); + var ReactFiberInstrumentation = require('./ReactFiberInstrumentation'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); + var getComponentName = require('shared/getComponentName'); var didWarnAboutNestedUpdates = false; } diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js index 6c6b894a4c99..590a79ee1007 100644 --- a/packages/react-reconciler/src/ReactFiberRoot.js +++ b/packages/react-reconciler/src/ReactFiberRoot.js @@ -13,8 +13,8 @@ import type {Fiber} from 'ReactFiber'; import type {ExpirationTime} from 'ReactFiberExpirationTime'; -const {createHostRootFiber} = require('ReactFiber'); -const {NoWork} = require('ReactFiberExpirationTime'); +const {createHostRootFiber} = require('./ReactFiber'); +const {NoWork} = require('./ReactFiberExpirationTime'); export type FiberRoot = { // Any additional information from the host associated with this root. diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index da726ef51ee8..59c4d5a5b2ed 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -30,28 +30,28 @@ export type HandleErrorInfo = { componentStack: string, }; -var {popContextProvider} = require('ReactFiberContext'); -const {reset} = require('ReactFiberStack'); +var {popContextProvider} = require('./ReactFiberContext'); +const {reset} = require('./ReactFiberStack'); var { getStackAddendumByWorkInProgressFiber, -} = require('ReactFiberComponentTreeHook'); -var {logCapturedError} = require('ReactFiberErrorLogger'); +} = require('shared/ReactFiberComponentTreeHook'); +var {logCapturedError} = require('./ReactFiberErrorLogger'); var { invokeGuardedCallback, hasCaughtError, clearCaughtError, -} = require('ReactErrorUtils'); +} = 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('ReactGlobalSharedState'); -var getComponentName = require('getComponentName'); +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 {createWorkInProgress} = require('./ReactFiber'); +var {onCommitRoot} = require('./ReactFiberDevToolsHook'); var { NoWork, @@ -60,9 +60,9 @@ var { Never, msToExpirationTime, computeExpirationBucket, -} = require('ReactFiberExpirationTime'); +} = require('./ReactFiberExpirationTime'); -var {AsyncUpdates} = require('ReactTypeOfInternalContext'); +var {AsyncUpdates} = require('./ReactTypeOfInternalContext'); var { PerformedWork, @@ -74,25 +74,25 @@ var { Callback, Err, Ref, -} = require('ReactTypeOfSideEffect'); +} = require('./ReactTypeOfSideEffect'); var { HostRoot, HostComponent, HostPortal, ClassComponent, -} = require('ReactTypeOfWork'); +} = require('shared/ReactTypeOfWork'); -var {getUpdateExpirationTime} = require('ReactFiberUpdateQueue'); +var {getUpdateExpirationTime} = require('./ReactFiberUpdateQueue'); -var {resetContext} = require('ReactFiberContext'); +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 ReactFiberInstrumentation = require('./ReactFiberInstrumentation'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); var { recordEffect, recordScheduleUpdate, @@ -107,7 +107,7 @@ if (__DEV__) { stopCommitHostEffectsTimer, startCommitLifeCyclesTimer, stopCommitLifeCyclesTimer, - } = require('ReactDebugFiberPerf'); + } = require('./ReactDebugFiberPerf'); var didWarnAboutStateTransition = false; diff --git a/packages/react-reconciler/src/ReactFiberUpdateQueue.js b/packages/react-reconciler/src/ReactFiberUpdateQueue.js index 2a6cd6cf495e..4a605d23c065 100644 --- a/packages/react-reconciler/src/ReactFiberUpdateQueue.js +++ b/packages/react-reconciler/src/ReactFiberUpdateQueue.js @@ -13,11 +13,11 @@ import type {Fiber} from 'ReactFiber'; import type {ExpirationTime} from 'ReactFiberExpirationTime'; -const {Callback: CallbackEffect} = require('ReactTypeOfSideEffect'); +const {Callback: CallbackEffect} = require('./ReactTypeOfSideEffect'); -const {NoWork} = require('ReactFiberExpirationTime'); +const {NoWork} = require('./ReactFiberExpirationTime'); -const {ClassComponent, HostRoot} = require('ReactTypeOfWork'); +const {ClassComponent, HostRoot} = require('shared/ReactTypeOfWork'); const invariant = require('fbjs/lib/invariant'); diff --git a/packages/react-reconciler/src/__tests__/ReactCoroutine-test.js b/packages/react-reconciler/src/__tests__/ReactCoroutine-test.js index 310db4813f8d..2f02d6fa6b45 100644 --- a/packages/react-reconciler/src/__tests__/ReactCoroutine-test.js +++ b/packages/react-reconciler/src/__tests__/ReactCoroutine-test.js @@ -19,7 +19,8 @@ describe('ReactCoroutine', () => { React = require('react'); ReactNoop = require('react-noop-renderer'); // TODO: can we express this test with only public API? - ReactCoroutine = require('ReactCoroutine'); + // TODO: direct imports like some-package/src/* are bad. Fix me. + ReactCoroutine = require('react-reconciler/src/isomorphic/ReactCoroutine'); }); function div(...children) { diff --git a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js index 023050b51977..7bc0831754e6 100644 --- a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js +++ b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js @@ -17,7 +17,7 @@ describe('ReactPersistent', () => { beforeEach(() => { jest.resetModules(); - const ReactFeatureFlags = require('ReactFeatureFlags'); + const ReactFeatureFlags = require('shared/ReactFeatureFlags'); ReactFeatureFlags.enableMutableReconciler = false; ReactFeatureFlags.enablePersistentReconciler = true; ReactFeatureFlags.enableNoopReconciler = false; diff --git a/packages/react-rt-renderer/src/ReactNativeRT.js b/packages/react-rt-renderer/src/ReactNativeRT.js index 4b4608731fd6..fc2189ae5341 100644 --- a/packages/react-rt-renderer/src/ReactNativeRT.js +++ b/packages/react-rt-renderer/src/ReactNativeRT.js @@ -10,16 +10,17 @@ 'use strict'; -const ReactFiberErrorLogger = require('ReactFiberErrorLogger'); -const ReactGenericBatching = require('ReactGenericBatching'); -const ReactNativeFiberErrorDialog = require('ReactNativeFiberErrorDialog'); // Reused from RN, seems fine? -const ReactPortal = require('ReactPortal'); -const ReactNativeRTComponentTree = require('ReactNativeRTComponentTree'); -const ReactNativeRTFiberRenderer = require('ReactNativeRTFiberRenderer'); -const ReactNativeRTFiberInspector = require('ReactNativeRTFiberInspector'); -const ReactVersion = require('ReactVersion'); - -const {injectInternals} = require('ReactFiberDevToolsHook'); +// 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'); +const ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); +const {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); + +const ReactGenericBatching = require('shared/event/ReactGenericBatching'); +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 'ReactTypes'; diff --git a/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js b/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js index a6855678dc4b..a350dca24833 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js +++ b/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js @@ -9,8 +9,10 @@ */ 'use strict'; -var ReactNativeRTComponentTree = require('ReactNativeRTComponentTree'); -var ReactGenericBatching = require('ReactGenericBatching'); +var ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); +var ReactGenericBatching = require('shared/event/ReactGenericBatching'); + +// Module provided by RN: var BatchedBridge = require('BatchedBridge'); var ReactNativeRTEventEmitter = { diff --git a/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js b/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js index e5f9baeafe64..a883e87a62f2 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js +++ b/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js @@ -9,11 +9,11 @@ */ 'use strict'; -const ReactNativeRTComponentTree = require('ReactNativeRTComponentTree'); -const ReactFiberTreeReflection = require('ReactFiberTreeReflection'); -const getComponentName = require('getComponentName'); +const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); +const ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); +const getComponentName = require('shared/getComponentName'); const emptyObject = require('fbjs/lib/emptyObject'); -const ReactTypeOfWork = require('ReactTypeOfWork'); +const ReactTypeOfWork = require('shared/ReactTypeOfWork'); const invariant = require('fbjs/lib/invariant'); const {getFiberFromTag} = ReactNativeRTComponentTree; diff --git a/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js b/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js index fe90da2d4afa..d85cac6ca2d5 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js +++ b/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js @@ -11,8 +11,10 @@ 'use strict'; const ReactFiberReconciler = require('react-reconciler'); -const ReactNativeRTComponentTree = require('ReactNativeRTComponentTree'); -const ReactNativeRTTagHandles = require('ReactNativeRTTagHandles'); +const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); +const ReactNativeRTTagHandles = require('./ReactNativeRTTagHandles'); + +// Module provided by RN: const RTManager = require('RTManager'); const emptyObject = require('fbjs/lib/emptyObject'); diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js index 866619997c46..9ac35d2bc580 100644 --- a/packages/react-test-renderer/src/ReactShallowRenderer.js +++ b/packages/react-test-renderer/src/ReactShallowRenderer.js @@ -14,8 +14,8 @@ const React = require('react'); const emptyObject = require('fbjs/lib/emptyObject'); const invariant = require('fbjs/lib/invariant'); -const describeComponentFrame = require('describeComponentFrame'); -const getComponentName = require('getComponentName'); +const describeComponentFrame = require('shared/describeComponentFrame'); +const getComponentName = require('shared/getComponentName'); class ReactShallowRenderer { static createRenderer = function() { diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index be6267c898f3..e0253ad3f657 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -10,10 +10,10 @@ 'use strict'; var ReactFiberReconciler = require('react-reconciler'); -var ReactFiberTreeReflection = require('ReactFiberTreeReflection'); -var ReactGenericBatching = require('ReactGenericBatching'); +var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); +var ReactGenericBatching = require('shared/event/ReactGenericBatching'); var emptyObject = require('fbjs/lib/emptyObject'); -var ReactTypeOfWork = require('ReactTypeOfWork'); +var ReactTypeOfWork = require('shared/ReactTypeOfWork'); var invariant = require('fbjs/lib/invariant'); var { Fragment, diff --git a/packages/shared/ReactFiberComponentTreeHook.js b/packages/shared/ReactFiberComponentTreeHook.js index ced52082590d..9a705e76f012 100644 --- a/packages/shared/ReactFiberComponentTreeHook.js +++ b/packages/shared/ReactFiberComponentTreeHook.js @@ -10,15 +10,15 @@ 'use strict'; -var ReactTypeOfWork = require('ReactTypeOfWork'); +var ReactTypeOfWork = require('./ReactTypeOfWork'); var { IndeterminateComponent, FunctionalComponent, ClassComponent, HostComponent, } = ReactTypeOfWork; -var describeComponentFrame = require('describeComponentFrame'); -var getComponentName = require('getComponentName'); +var describeComponentFrame = require('./describeComponentFrame'); +var getComponentName = require('./getComponentName'); import type {Fiber} from 'ReactFiber'; diff --git a/packages/shared/ReactFiberTreeReflection.js b/packages/shared/ReactFiberTreeReflection.js index 2ee9626866d5..73df623d80cb 100644 --- a/packages/shared/ReactFiberTreeReflection.js +++ b/packages/shared/ReactFiberTreeReflection.js @@ -12,10 +12,10 @@ import type {Fiber} from 'ReactFiber'; -var ReactInstanceMap = require('ReactInstanceMap'); -var {ReactCurrentOwner} = require('ReactGlobalSharedState'); +var ReactInstanceMap = require('./ReactInstanceMap'); +var {ReactCurrentOwner} = require('./ReactGlobalSharedState'); -var getComponentName = require('getComponentName'); +var getComponentName = require('./getComponentName'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { @@ -28,9 +28,9 @@ var { HostRoot, HostPortal, HostText, -} = require('ReactTypeOfWork'); +} = require('./ReactTypeOfWork'); -var {NoEffect, Placement} = require('ReactTypeOfSideEffect'); +var {NoEffect, Placement} = require('./ReactTypeOfSideEffect'); var MOUNTING = 1; var MOUNTED = 2; diff --git a/packages/shared/ReactTreeTraversal.js b/packages/shared/ReactTreeTraversal.js index a926440d734f..69acaba3022a 100644 --- a/packages/shared/ReactTreeTraversal.js +++ b/packages/shared/ReactTreeTraversal.js @@ -9,7 +9,7 @@ 'use strict'; -var {HostComponent} = require('ReactTypeOfWork'); +var {HostComponent} = require('./ReactTypeOfWork'); function getParent(inst) { do { diff --git a/packages/shared/__tests__/ReactErrorUtils-test.js b/packages/shared/__tests__/ReactErrorUtils-test.js index 1fd7c04d0045..79d487121b96 100644 --- a/packages/shared/__tests__/ReactErrorUtils-test.js +++ b/packages/shared/__tests__/ReactErrorUtils-test.js @@ -14,7 +14,7 @@ var ReactErrorUtils; describe('ReactErrorUtils', () => { beforeEach(() => { // TODO: can we express this test with only public API? - ReactErrorUtils = require('ReactErrorUtils'); + ReactErrorUtils = require('../ReactErrorUtils'); }); // Run tests in both DEV and production diff --git a/packages/shared/__tests__/reactProdInvariant-test.js b/packages/shared/__tests__/reactProdInvariant-test.js index a406a796c672..31689d4cbeab 100644 --- a/packages/shared/__tests__/reactProdInvariant-test.js +++ b/packages/shared/__tests__/reactProdInvariant-test.js @@ -13,7 +13,7 @@ var reactProdInvariant; describe('reactProdInvariant', () => { beforeEach(() => { jest.resetModules(); - reactProdInvariant = require('reactProdInvariant'); + reactProdInvariant = require('../reactProdInvariant'); }); it('should throw with the correct number of `%s`s in the URL', () => { From 6aba381fc828d84619da846f8d940fbfb1197caf Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 18:39:28 +0100 Subject: [PATCH 05/29] Fix as many issues as I can This uncovered an interesting problem where ./b from package/src/a would resolve to a different instantiation of package/src/b in Jest. Either this is a showstopper or we can solve it by completely fobbidding remaining /src/. --- .../src/__tests__/ReactNativeCS-test.js | 2 +- .../__tests__/ReactBrowserEventEmitter-test.js | 4 ++-- .../src/__tests__/ReactDOMFiberAsync-test.js | 4 ++-- .../react-dom/src/__tests__/ReactMount-test.js | 2 +- .../src/__tests__/ReactTreeTraversal-test.js | 2 +- packages/react-dom/src/client/ReactDOM.js | 18 +++++++++--------- .../src/client/ReactDOMClientInjection.js | 6 +++--- .../src/client/ReactDOMComponentTree.js | 2 +- .../src/client/ReactDOMFiberComponent.js | 4 ++-- .../react-dom/src/client/ReactDOMSelection.js | 2 +- .../src/client/ReactInputSelection.js | 2 +- .../getNodeForCharacterOffset-test.js | 2 +- .../src/client/__tests__/setInnerHTML-test.js | 4 ++-- .../src/client/getNodeForCharacterOffset.js | 2 +- .../react-dom/src/client/setTextContent.js | 2 +- .../src/events/BeforeInputEventPlugin.js | 6 +++--- .../src/events/EnterLeaveEventPlugin.js | 2 +- .../react-dom/src/events/SelectEventPlugin.js | 4 ++-- .../react-dom/src/events/SimpleEventPlugin.js | 2 +- .../events/__tests__/SyntheticEvent-test.js | 2 +- .../react-dom/src/events/getEventTarget.js | 2 +- .../src/shared/ReactDOMInvalidARIAHook.js | 2 +- .../src/ReactNativeRenderer.js | 18 +++++++++--------- .../src/__mocks__/UIManager.js | 2 +- .../src/__mocks__/View.js | 2 +- .../src/ReactFiberCompleteWork.js | 2 +- .../src/ReactFiberReconciler.js | 2 +- .../src/ReactFiberScheduler.js | 2 +- .../src/ReactFiberUpdateQueue.js | 2 +- .../ReactIncrementalErrorHandling-test.js | 9 ++++++--- .../src/__tests__/ReactIncrementalPerf-test.js | 4 ++-- .../src/__tests__/ReactPersistent-test.js | 2 +- packages/react/src/React.js | 2 +- packages/react/src/ReactChildren.js | 2 +- .../shared/__tests__/ReactErrorUtils-test.js | 6 +++--- packages/shared/package.json | 4 ++++ scripts/jest/setup.js | 7 ++++--- 37 files changed, 76 insertions(+), 68 deletions(-) create mode 100644 packages/shared/package.json diff --git a/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js b/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js index 3fa811fb255b..98817ad22a63 100644 --- a/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js +++ b/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js @@ -12,7 +12,7 @@ var React; var ReactNativeCS; -jest.mock('ReactFeatureFlags', () => require('ReactNativeCSFeatureFlags')); +jest.mock('shared/ReactFeatureFlags', () => require('shared/ReactNativeCSFeatureFlags')); describe('ReactNativeCS', () => { beforeEach(() => { diff --git a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js index 64c8697e14d6..0486a2a48ca7 100644 --- a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js +++ b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js @@ -59,8 +59,8 @@ describe('ReactBrowserEventEmitter', () => { LISTENER.mockClear(); EventListener = require('fbjs/lib/EventListener'); // TODO: can we express this test with only public API? - EventPluginHub = require('shared/EventPluginHub'); - EventPluginRegistry = require('shared/EventPluginRegistry'); + EventPluginHub = require('shared/event/EventPluginHub'); + EventPluginRegistry = require('shared/event/EventPluginRegistry'); React = require('react'); ReactDOM = require('react-dom'); ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); diff --git a/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js b/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js index 94fb3d630355..17250d461eb6 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFiberAsync-test.js @@ -38,7 +38,7 @@ describe('ReactDOMFiberAsync', () => { describe('with feature flag disabled', () => { beforeEach(() => { jest.resetModules(); - ReactFeatureFlags = require('ReactFeatureFlags'); + ReactFeatureFlags = require('shared/ReactFeatureFlags'); container = document.createElement('div'); ReactFeatureFlags.enableAsyncSubtreeAPI = false; ReactDOM = require('react-dom'); @@ -62,7 +62,7 @@ describe('ReactDOMFiberAsync', () => { describe('with feature flag enabled', () => { beforeEach(() => { jest.resetModules(); - ReactFeatureFlags = require('ReactFeatureFlags'); + ReactFeatureFlags = require('shared/ReactFeatureFlags'); container = document.createElement('div'); ReactFeatureFlags.enableAsyncSubtreeAPI = true; ReactDOM = require('react-dom'); diff --git a/packages/react-dom/src/__tests__/ReactMount-test.js b/packages/react-dom/src/__tests__/ReactMount-test.js index 88afe072343a..b14143dba346 100644 --- a/packages/react-dom/src/__tests__/ReactMount-test.js +++ b/packages/react-dom/src/__tests__/ReactMount-test.js @@ -9,7 +9,7 @@ 'use strict'; -const {COMMENT_NODE} = require('HTMLNodeType'); +const {COMMENT_NODE} = require('../shared/HTMLNodeType'); const invariant = require('invariant'); diff --git a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js index 1dd1b78dc643..7afd0987d590 100644 --- a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js +++ b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js @@ -62,7 +62,7 @@ describe('ReactTreeTraversal', () => { } beforeEach(() => { - ReactTreeTraversal = require('ReactTreeTraversal'); + ReactTreeTraversal = require('shared/ReactTreeTraversal'); mockFn.mockReset(); }); diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index d1ef3c6c91ca..d21c8fe701be 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -32,11 +32,11 @@ var { COMMENT_NODE, DOCUMENT_NODE, DOCUMENT_FRAGMENT_NODE, -} = require('HTMLNodeType'); -var {ROOT_ATTRIBUTE_NAME} = require('DOMProperty'); +} = 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/isomoprhic/ReactPortal'); +var ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); var {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); var getComponentName = require('shared/getComponentName'); @@ -83,8 +83,8 @@ if (__DEV__) { } } -require('ReactDOMClientInjection'); -require('ReactDOMInjection'); +require('./ReactDOMClientInjection'); +require('../shared/ReactDOMInjection'); ReactControlledComponent.injection.injectFiberControlledHostComponent( ReactDOMFiberComponent, ); @@ -940,13 +940,13 @@ var ReactDOM = { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: { // For TapEventPlugin which is popular in open source - EventPluginHub: require('EventPluginHub'), + EventPluginHub: require('shared/event/EventPluginHub'), // Used by test-utils - EventPluginRegistry: require('EventPluginRegistry'), - EventPropagators: require('EventPropagators'), + EventPluginRegistry: require('shared/event/EventPluginRegistry'), + EventPropagators: require('shared/event/EventPropagators'), ReactControlledComponent, ReactDOMComponentTree, - ReactDOMEventListener: require('ReactDOMEventListener'), + ReactDOMEventListener: require('./event/ReactDOMEventListener'), }, }; diff --git a/packages/react-dom/src/client/ReactDOMClientInjection.js b/packages/react-dom/src/client/ReactDOMClientInjection.js index f2c97c0b3cbb..d2a3dfc19367 100644 --- a/packages/react-dom/src/client/ReactDOMClientInjection.js +++ b/packages/react-dom/src/client/ReactDOMClientInjection.js @@ -10,11 +10,11 @@ 'use strict'; var BeforeInputEventPlugin = require('./event/plugins/BeforeInputEventPlugin'); -var ChangeEventPlugin = require('/event/plugins/ChangeEventPlugin'); +var ChangeEventPlugin = require('./event/plugins/ChangeEventPlugin'); var DOMEventPluginOrder = require('./event/plugins/DOMEventPluginOrder'); var EnterLeaveEventPlugin = require('./event/plugins/EnterLeaveEventPlugin'); -var EventPluginHub = require('./event/EventPluginHub'); -var EventPluginUtils = require('./event/EventPluginUtils'); +var EventPluginHub = require('shared/event/EventPluginHub'); +var EventPluginUtils = require('shared/event/EventPluginUtils'); var ReactBrowserEventEmitter = require('./event/ReactBrowserEventEmitter'); var ReactDOMComponentTree = require('./ReactDOMComponentTree'); var ReactDOMEventListener = require('./event/ReactDOMEventListener'); diff --git a/packages/react-dom/src/client/ReactDOMComponentTree.js b/packages/react-dom/src/client/ReactDOMComponentTree.js index e8969c183a14..1c531f5e93fe 100644 --- a/packages/react-dom/src/client/ReactDOMComponentTree.js +++ b/packages/react-dom/src/client/ReactDOMComponentTree.js @@ -9,7 +9,7 @@ 'use strict'; -var {HostComponent, HostText} = require('ReactTypeOfWork'); +var {HostComponent, HostText} = require('shared/ReactTypeOfWork'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js index 24b23af3c08e..650febb5fb6d 100644 --- a/packages/react-dom/src/client/ReactDOMFiberComponent.js +++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js @@ -13,7 +13,7 @@ var CSSPropertyOperations = require('../shared/CSSPropertyOperations'); var DOMNamespaces = require('../shared/DOMNamespaces'); var DOMProperty = require('../shared/DOMProperty'); -var DOMPropertyOperations = require('../shared/DOMPropertyOperations'); +var DOMPropertyOperations = require('./DOMPropertyOperations'); var EventPluginRegistry = require('shared/event/EventPluginRegistry'); var ReactBrowserEventEmitter = require('./event/ReactBrowserEventEmitter'); var ReactDOMFiberInput = require('./ReactDOMFiberInput'); @@ -24,7 +24,7 @@ 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 {DOCUMENT_NODE, DOCUMENT_FRAGMENT_NODE} = require('../shared/HTMLNodeType'); var assertValidProps = require('../shared/assertValidProps'); var emptyFunction = require('fbjs/lib/emptyFunction'); diff --git a/packages/react-dom/src/client/ReactDOMSelection.js b/packages/react-dom/src/client/ReactDOMSelection.js index 0b87054ec89e..aab2fff2a0af 100644 --- a/packages/react-dom/src/client/ReactDOMSelection.js +++ b/packages/react-dom/src/client/ReactDOMSelection.js @@ -9,7 +9,7 @@ 'use strict'; -var {TEXT_NODE} = require('shared/HTMLNodeType'); +var {TEXT_NODE} = require('../shared/HTMLNodeType'); var getNodeForCharacterOffset = require('./getNodeForCharacterOffset'); var getTextContentAccessor = require('./getTextContentAccessor'); diff --git a/packages/react-dom/src/client/ReactInputSelection.js b/packages/react-dom/src/client/ReactInputSelection.js index 3dea75b8523b..41b3adb970d7 100644 --- a/packages/react-dom/src/client/ReactInputSelection.js +++ b/packages/react-dom/src/client/ReactInputSelection.js @@ -10,7 +10,7 @@ 'use strict'; var ReactDOMSelection = require('./ReactDOMSelection'); -var {ELEMENT_NODE} = require('shared/HTMLNodeType'); +var {ELEMENT_NODE} = require('../shared/HTMLNodeType'); var containsNode = require('fbjs/lib/containsNode'); var focusNode = require('fbjs/lib/focusNode'); diff --git a/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js b/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js index 1e465d6bf5cb..05f07f572659 100644 --- a/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js +++ b/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getNodeForCharacterOffset = require('../client/getNodeForCharacterOffset'); +var getNodeForCharacterOffset = require('../getNodeForCharacterOffset'); // Create node from HTML string function createNode(html) { diff --git a/packages/react-dom/src/client/__tests__/setInnerHTML-test.js b/packages/react-dom/src/client/__tests__/setInnerHTML-test.js index 975ffb14ede8..70b52f25c5c9 100644 --- a/packages/react-dom/src/client/__tests__/setInnerHTML-test.js +++ b/packages/react-dom/src/client/__tests__/setInnerHTML-test.js @@ -10,8 +10,8 @@ 'use strict'; // TODO: can we express this test with only public API? -var setInnerHTML = require('../client/setInnerHTML'); -var Namespaces = require('../client/DOMNamespaces').Namespaces; +var setInnerHTML = require('../setInnerHTML'); +var Namespaces = require('../../shared/DOMNamespaces').Namespaces; describe('setInnerHTML', () => { describe('when the node has innerHTML property', () => { diff --git a/packages/react-dom/src/client/getNodeForCharacterOffset.js b/packages/react-dom/src/client/getNodeForCharacterOffset.js index 03c1232e9587..972ba328c85c 100644 --- a/packages/react-dom/src/client/getNodeForCharacterOffset.js +++ b/packages/react-dom/src/client/getNodeForCharacterOffset.js @@ -9,7 +9,7 @@ 'use strict'; -var {TEXT_NODE} = require('shared/HTMLNodeType'); +var {TEXT_NODE} = require('../shared/HTMLNodeType'); /** * Given any node return the first leaf node without children. diff --git a/packages/react-dom/src/client/setTextContent.js b/packages/react-dom/src/client/setTextContent.js index 0e11fce62c0a..1e821103c773 100644 --- a/packages/react-dom/src/client/setTextContent.js +++ b/packages/react-dom/src/client/setTextContent.js @@ -12,7 +12,7 @@ var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); var escapeTextContentForBrowser = require('../shared/escapeTextContentForBrowser'); var setInnerHTML = require('./setInnerHTML'); -var {TEXT_NODE} = require('shared/HTMLNodeType'); +var {TEXT_NODE} = require('../shared/HTMLNodeType'); /** * Set the textContent property of a node, ensuring that whitespace is preserved diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js index a1ea02644bc4..46485af81046 100644 --- a/packages/react-dom/src/events/BeforeInputEventPlugin.js +++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js @@ -11,9 +11,9 @@ var EventPropagators = require('shared/event/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var FallbackCompositionState = require('../FallbackCompositionState'); -var SyntheticCompositionEvent = require('../../SyntheticCompositionEvent'); -var SyntheticInputEvent = require('../../SyntheticInputEvent'); +var FallbackCompositionState = require('./FallbackCompositionState'); +var SyntheticCompositionEvent = require('../SyntheticCompositionEvent'); +var SyntheticInputEvent = require('../SyntheticInputEvent'); import type {TopLevelTypes} from 'BrowserEventConstants'; diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js index 1b31bf8c705d..25c7967f3e4c 100644 --- a/packages/react-dom/src/events/EnterLeaveEventPlugin.js +++ b/packages/react-dom/src/events/EnterLeaveEventPlugin.js @@ -10,7 +10,7 @@ 'use strict'; var EventPropagators = require('shared/event/EventPropagators'); -var ReactDOMComponentTree = require('../../../ReactDOMComponentTree'); +var ReactDOMComponentTree = require('../../ReactDOMComponentTree'); var SyntheticMouseEvent = require('../SyntheticMouseEvent'); var eventTypes = { diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js index 64a39efc4357..254cf229f8b3 100644 --- a/packages/react-dom/src/events/SelectEventPlugin.js +++ b/packages/react-dom/src/events/SelectEventPlugin.js @@ -14,8 +14,8 @@ var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); var ReactBrowserEventEmitter = require('../ReactBrowserEventEmitter'); var ReactDOMComponentTree = require('../../ReactDOMComponentTree'); var ReactInputSelection = require('../../ReactInputSelection'); -var SyntheticEvent = require('../SyntheticEvent'); -var {DOCUMENT_NODE} = require('shared/HTMLNodeType'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); +var {DOCUMENT_NODE} = require('../../../shared/HTMLNodeType'); var getActiveElement = require('fbjs/lib/getActiveElement'); var isTextInputElement = require('shared/isTextInputElement'); diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js index 30bdf67ae70a..d59814ad1e86 100644 --- a/packages/react-dom/src/events/SimpleEventPlugin.js +++ b/packages/react-dom/src/events/SimpleEventPlugin.js @@ -13,7 +13,7 @@ var EventPropagators = require('shared/event/EventPropagators'); var SyntheticAnimationEvent = require('../SyntheticAnimationEvent'); var SyntheticClipboardEvent = require('../SyntheticClipboardEvent'); -var SyntheticEvent = require('../SyntheticEvent'); +var SyntheticEvent = require('shared/event/SyntheticEvent'); var SyntheticFocusEvent = require('../SyntheticFocusEvent'); var SyntheticKeyboardEvent = require('../SyntheticKeyboardEvent'); var SyntheticMouseEvent = require('../SyntheticMouseEvent'); diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js index ccdfa79378ca..9abc77ea8687 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js @@ -19,7 +19,7 @@ describe('SyntheticEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticEvent = require('../SyntheticEvent'); + SyntheticEvent = require('shared/event/SyntheticEvent'); React = require('react'); ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); diff --git a/packages/react-dom/src/events/getEventTarget.js b/packages/react-dom/src/events/getEventTarget.js index 64662285f142..a32a6e3a8d14 100644 --- a/packages/react-dom/src/events/getEventTarget.js +++ b/packages/react-dom/src/events/getEventTarget.js @@ -9,7 +9,7 @@ 'use strict'; -var {TEXT_NODE} = require('shared/HTMLNodeType'); +var {TEXT_NODE} = require('../../shared/HTMLNodeType'); /** * Gets the target node from a native browser event by accounting for diff --git a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js index 9ce78e7d8095..eeea4b680808 100644 --- a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js +++ b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js @@ -22,7 +22,7 @@ var hasOwnProperty = Object.prototype.hasOwnProperty; if (__DEV__) { var warning = require('fbjs/lib/warning'); - var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState'); + var {ReactDebugCurrentFrame} = require('shared/ReactGlobalSharedState'); var validAriaProperties = require('./validAriaProperties'); } diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index 10e391259c22..b6d91623985c 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -44,7 +44,7 @@ ReactFiberErrorLogger.injection.injectDialog( ); const ReactNativeRenderer: ReactNativeType = { - NativeComponent: require('ReactNativeComponent'), + NativeComponent: require('./ReactNativeComponent'), findNodeHandle: findNumericNodeHandle, @@ -93,16 +93,16 @@ const ReactNativeRenderer: ReactNativeType = { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: { // Used as a mixin in many createClass-based components - NativeMethodsMixin: require('NativeMethodsMixin'), + NativeMethodsMixin: require('./NativeMethodsMixin'), // Used by react-native-github/Libraries/ components - ReactNativeBridgeEventPlugin: require('ReactNativeBridgeEventPlugin'), // requireNativeComponent - ReactGlobalSharedState: require('ReactGlobalSharedState'), // Systrace - ReactNativeComponentTree: require('ReactNativeComponentTree'), // InspectorUtils, ScrollResponder - ReactNativePropRegistry: require('ReactNativePropRegistry'), // flattenStyle, Stylesheet - TouchHistoryMath: require('TouchHistoryMath'), // PanResponder - createReactNativeComponentClass: require('createReactNativeComponentClass'), // eg RCTText, RCTView, ReactNativeART - takeSnapshot: require('takeSnapshot'), // react-native-implementation + ReactNativeBridgeEventPlugin: require('./ReactNativeBridgeEventPlugin'), // requireNativeComponent + ReactGlobalSharedState: require('shared/ReactGlobalSharedState'), // Systrace + ReactNativeComponentTree: require('./ReactNativeComponentTree'), // InspectorUtils, ScrollResponder + ReactNativePropRegistry: require('./ReactNativePropRegistry'), // flattenStyle, Stylesheet + TouchHistoryMath: require('shared/event/plugins/TouchHistoryMath'), // PanResponder + createReactNativeComponentClass: require('./createReactNativeComponentClass'), // eg RCTText, RCTView, ReactNativeART + takeSnapshot: require('./takeSnapshot'), // react-native-implementation }, }; diff --git a/packages/react-native-renderer/src/__mocks__/UIManager.js b/packages/react-native-renderer/src/__mocks__/UIManager.js index def31e2ad1ff..5ffdc3ddeb98 100644 --- a/packages/react-native-renderer/src/__mocks__/UIManager.js +++ b/packages/react-native-renderer/src/__mocks__/UIManager.js @@ -9,7 +9,7 @@ // Mock of the Native Hooks -const ReactNativeTagHandles = require('ReactNativeTagHandles'); +const ReactNativeTagHandles = require('../ReactNativeTagHandles'); const invariant = require('fbjs/lib/invariant'); // Map of viewTag -> {children: [childTag], parent: ?parentTag} diff --git a/packages/react-native-renderer/src/__mocks__/View.js b/packages/react-native-renderer/src/__mocks__/View.js index d74f2f822b65..988458ec44c1 100644 --- a/packages/react-native-renderer/src/__mocks__/View.js +++ b/packages/react-native-renderer/src/__mocks__/View.js @@ -7,7 +7,7 @@ 'use strict'; -var createReactNativeComponentClass = require('createReactNativeComponentClass'); +var createReactNativeComponentClass = require('../createReactNativeComponentClass'); var View = createReactNativeComponentClass({ validAttributes: {}, diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index 18a46d63e8dc..80c194ff8449 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -25,7 +25,7 @@ var { } = require('./ReactFiberContext'); var ReactFeatureFlags = require('shared/ReactFeatureFlags'); var ReactTypeOfWork = require('shared/ReactTypeOfWork'); -var ReactTypeOfSideEffect = require('./ReactTypeOfSideEffect'); +var ReactTypeOfSideEffect = require('shared/ReactTypeOfSideEffect'); var ReactFiberExpirationTime = require('./ReactFiberExpirationTime'); var { IndeterminateComponent, diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index 66ea0ebc91b4..61ae1fee9696 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -37,7 +37,7 @@ if (__DEV__) { var { findCurrentHostFiber, findCurrentHostFiberWithNoPortals, -} = require('ReactFiberTreeReflection'); +} = require('shared/ReactFiberTreeReflection'); export type Deadline = { timeRemaining: () => number, diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index 59c4d5a5b2ed..9bc83a0d08d1 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -74,7 +74,7 @@ var { Callback, Err, Ref, -} = require('./ReactTypeOfSideEffect'); +} = require('shared/ReactTypeOfSideEffect'); var { HostRoot, diff --git a/packages/react-reconciler/src/ReactFiberUpdateQueue.js b/packages/react-reconciler/src/ReactFiberUpdateQueue.js index 4a605d23c065..79ebac761664 100644 --- a/packages/react-reconciler/src/ReactFiberUpdateQueue.js +++ b/packages/react-reconciler/src/ReactFiberUpdateQueue.js @@ -13,7 +13,7 @@ import type {Fiber} from 'ReactFiber'; import type {ExpirationTime} from 'ReactFiberExpirationTime'; -const {Callback: CallbackEffect} = require('./ReactTypeOfSideEffect'); +const {Callback: CallbackEffect} = require('shared/ReactTypeOfSideEffect'); const {NoWork} = require('./ReactFiberExpirationTime'); diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.js index ef0766195291..250575debd0a 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.js +++ b/packages/react-reconciler/src/__tests__/ReactIncrementalErrorHandling-test.js @@ -935,9 +935,11 @@ describe('ReactIncrementalErrorHandling', () => { function initReactFiberErrorLoggerMock(mock) { jest.resetModules(); if (mock) { - jest.mock('ReactFiberErrorLogger'); + // TODO: direct imports like some-package/src/* are bad. Fix me. + jest.mock('react-reconciler/src/ReactFiberErrorLogger'); } else { - jest.unmock('ReactFiberErrorLogger'); + // TODO: direct imports like some-package/src/* are bad. Fix me. + jest.unmock('react-reconciler/src/ReactFiberErrorLogger'); } React = require('react'); ReactNoop = require('react-noop-renderer'); @@ -1033,7 +1035,8 @@ describe('ReactIncrementalErrorHandling', () => { const logCapturedErrorCalls = []; - const ReactFiberErrorLogger = require('ReactFiberErrorLogger'); + // TODO: direct imports like some-package/src/* are bad. Fix me. + const ReactFiberErrorLogger = require('react-reconciler/src/ReactFiberErrorLogger'); ReactFiberErrorLogger.logCapturedError.mockImplementation( capturedError => { logCapturedErrorCalls.push(capturedError); diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js index c3e766896435..38dba350c55c 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js +++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js @@ -116,8 +116,8 @@ describe('ReactDebugFiberPerf', () => { React = require('react'); ReactNoop = require('react-noop-renderer'); // TODO: can we express this test with only public API? - ReactCoroutine = require('ReactCoroutine'); - ReactPortal = require('ReactPortal'); + ReactCoroutine = require('../isomorphic/ReactCoroutine'); + ReactPortal = require('../isomorphic/ReactPortal'); PropTypes = require('prop-types'); }); diff --git a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js index 7bc0831754e6..61fae0ec1211 100644 --- a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js +++ b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js @@ -24,7 +24,7 @@ describe('ReactPersistent', () => { React = require('react'); ReactNoop = require('react-noop-renderer'); - ReactPortal = require('ReactPortal'); + ReactPortal = require('../isomorphic/ReactPortal'); }); const DEFAULT_ROOT_ID = 'persistent-test'; diff --git a/packages/react/src/React.js b/packages/react/src/React.js index 4b26fd6e7f37..cc27b29523f3 100644 --- a/packages/react/src/React.js +++ b/packages/react/src/React.js @@ -47,7 +47,7 @@ var React = { version: ReactVersion, __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: { - ReactCurrentOwner: require('ReactCurrentOwner'), + ReactCurrentOwner: require('./element/ReactCurrentOwner'), // Used by renderers to avoid bundling object-assign twice in UMD bundles: assign: require('object-assign'), }, diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js index 99af9ef79764..502db0d5f004 100644 --- a/packages/react/src/ReactChildren.js +++ b/packages/react/src/ReactChildren.js @@ -16,7 +16,7 @@ var invariant = require('fbjs/lib/invariant'); if (__DEV__) { var warning = require('fbjs/lib/warning'); - var {getStackAddendum} = require('ReactDebugCurrentFrame'); + var {getStackAddendum} = require('../element/ReactDebugCurrentFrame'); } var ITERATOR_SYMBOL = typeof Symbol === 'function' && Symbol.iterator; diff --git a/packages/shared/__tests__/ReactErrorUtils-test.js b/packages/shared/__tests__/ReactErrorUtils-test.js index 79d487121b96..6f6d09b07b6e 100644 --- a/packages/shared/__tests__/ReactErrorUtils-test.js +++ b/packages/shared/__tests__/ReactErrorUtils-test.js @@ -36,7 +36,7 @@ describe('ReactErrorUtils', () => { }; jest.resetModules(); - ReactErrorUtils = require('ReactErrorUtils'); + ReactErrorUtils = require('../ReactErrorUtils'); }); afterEach(() => { @@ -161,9 +161,9 @@ describe('ReactErrorUtils', () => { }); it('handles nested errors in separate renderers', () => { - const ReactErrorUtils1 = require('ReactErrorUtils'); + const ReactErrorUtils1 = require('../ReactErrorUtils'); jest.resetModules(); - const ReactErrorUtils2 = require('ReactErrorUtils'); + const ReactErrorUtils2 = require('../ReactErrorUtils'); expect(ReactErrorUtils1).not.toEqual(ReactErrorUtils2); let ops = []; diff --git a/packages/shared/package.json b/packages/shared/package.json new file mode 100644 index 000000000000..c564d0797b28 --- /dev/null +++ b/packages/shared/package.json @@ -0,0 +1,4 @@ +{ + "private": true, + "name": "shared" +} \ No newline at end of file diff --git a/scripts/jest/setup.js b/scripts/jest/setup.js index a0fbd78530a0..c8fc8dd1435c 100644 --- a/scripts/jest/setup.js +++ b/scripts/jest/setup.js @@ -2,8 +2,8 @@ // We want to globally mock this but jest doesn't let us do that by default // for a file that already exists. So we have to explicitly mock it. -jest.mock('ReactFeatureFlags', () => { - const flags = require.requireActual('ReactFeatureFlags'); +jest.mock('shared/ReactFeatureFlags', () => { + const flags = require.requireActual('shared/ReactFeatureFlags'); return Object.assign({}, flags, { disableNewFiberFeatures: true, }); @@ -11,4 +11,5 @@ jest.mock('ReactFeatureFlags', () => { // Error logging varies between Fiber and Stack; // Rather than fork dozens of tests, mock the error-logging file by default. -jest.mock('ReactFiberErrorLogger'); +// TODO: direct imports like some-package/src/* are bad. Fix me. +jest.mock('react-reconciler/src/ReactFiberErrorLogger'); From f73928dc7f1c7ad8f72114bf31db7cfecfc84495 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 19:06:48 +0100 Subject: [PATCH 06/29] Fix all tests It seems we can't use relative requires in tests anymore. Otherwise Jest becomes confused between real file and symlink. https://github.com/facebook/jest/issues/3830 This seems bad... Except that we already *don't* want people to create tests that import individual source files. All existing cases of us doing so are actually TODOs waiting to be fixed. So perhaps this requirement isn't too bad because it makes bad code looks bad. Of course, if we go with this, we'll have to lint against relative requires in tests. It also makes moving things more painful. --- packages/events/__tests__/EventPluginRegistry-test.js | 2 +- packages/events/__tests__/ResponderEventPlugin-test.js | 2 +- packages/events/__tests__/accumulateInto-test.js | 2 +- .../react-cs-renderer/src/__tests__/ReactNativeCS-test.js | 2 +- .../src/__tests__/ReactBrowserEventEmitter-test.js | 6 +++--- .../react-dom/src/__tests__/ReactDOMComponent-test.js | 2 +- .../react-dom/src/__tests__/ReactDOMComponentTree-test.js | 2 +- .../react-dom/src/__tests__/ReactDOMEventListener-test.js | 4 ++-- .../react-dom/src/__tests__/ReactDOMSelection-test.js | 2 +- packages/react-dom/src/__tests__/ReactMount-test.js | 2 +- .../react-dom/src/__tests__/ReactServerRendering-test.js | 2 +- .../react-dom/src/__tests__/ReactTreeTraversal-test.js | 2 +- .../src/__tests__/escapeTextContentForBrowser-test.js | 2 +- .../react-dom/src/__tests__/inputValueTracking-test.js | 2 +- .../src/__tests__/quoteAttributeValueForBrowser-test.js | 2 +- .../react-dom/src/__tests__/validateDOMNesting-test.js | 2 +- .../client/__tests__/getNodeForCharacterOffset-test.js | 2 +- .../react-dom/src/client/__tests__/setInnerHTML-test.js | 4 ++-- .../src/events/__tests__/BeforeInputEventPlugin-test.js | 8 ++++---- .../src/events/__tests__/ChangeEventPlugin-test.js | 4 ++-- .../src/events/__tests__/EnterLeaveEventPlugin-test.js | 4 ++-- .../src/events/__tests__/FallbackCompositionState-test.js | 2 +- .../src/events/__tests__/SelectEventPlugin-test.js | 4 ++-- .../src/events/__tests__/SyntheticClipboardEvent-test.js | 4 ++-- .../react-dom/src/events/__tests__/SyntheticEvent-test.js | 2 +- .../src/events/__tests__/SyntheticKeyboardEvent-test.js | 8 ++++---- .../src/events/__tests__/SyntheticWheelEvent-test.js | 4 ++-- .../src/events/__tests__/getEventCharCode-test.js | 2 +- .../react-dom/src/events/__tests__/getEventKey-test.js | 2 +- packages/react-native-renderer/src/ReactNativeRenderer.js | 2 +- .../src/__tests__/ReactNativeAttributePayload-test.js | 4 ++-- .../src/__tests__/ReactNativeEvents-test.js | 4 ++-- .../src/__tests__/ReactNativeMount-test.js | 2 +- .../src/__tests__/createReactNativeComponentClass-test.js | 2 +- .../src/__tests__/ReactIncrementalPerf-test.js | 4 ++-- .../src/__tests__/ReactPersistent-test.js | 2 +- packages/shared/__tests__/ReactErrorUtils-test.js | 8 ++++---- packages/shared/__tests__/reactProdInvariant-test.js | 2 +- 38 files changed, 59 insertions(+), 59 deletions(-) diff --git a/packages/events/__tests__/EventPluginRegistry-test.js b/packages/events/__tests__/EventPluginRegistry-test.js index 7fe430719a96..d0907ce810a1 100644 --- a/packages/events/__tests__/EventPluginRegistry-test.js +++ b/packages/events/__tests__/EventPluginRegistry-test.js @@ -16,7 +16,7 @@ describe('EventPluginRegistry', () => { beforeEach(() => { jest.resetModuleRegistry(); // TODO: can we express this test with only public API? - EventPluginRegistry = require('../EventPluginRegistry'); + EventPluginRegistry = require('shared/event/EventPluginRegistry'); createPlugin = function(properties) { return Object.assign({extractEvents: function() {}}, properties); diff --git a/packages/events/__tests__/ResponderEventPlugin-test.js b/packages/events/__tests__/ResponderEventPlugin-test.js index ff542b066656..ea3d7325e6d5 100644 --- a/packages/events/__tests__/ResponderEventPlugin-test.js +++ b/packages/events/__tests__/ResponderEventPlugin-test.js @@ -9,7 +9,7 @@ 'use strict'; -var {HostComponent} = require('../../../ReactTypeOfWork'); +var {HostComponent} = require('shared/ReactTypeOfWork'); var EventPluginHub; var ResponderEventPlugin; diff --git a/packages/events/__tests__/accumulateInto-test.js b/packages/events/__tests__/accumulateInto-test.js index addb6c064256..a3b70118b795 100644 --- a/packages/events/__tests__/accumulateInto-test.js +++ b/packages/events/__tests__/accumulateInto-test.js @@ -13,7 +13,7 @@ var accumulateInto; describe('accumulateInto', () => { beforeEach(() => { - accumulateInto = require('../accumulateInto'); + accumulateInto = require('shared/event/accumulateInto'); }); it('throws if the second item is null', () => { diff --git a/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js b/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js index 98817ad22a63..1ab109be10bc 100644 --- a/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js +++ b/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js @@ -12,7 +12,7 @@ var React; var ReactNativeCS; -jest.mock('shared/ReactFeatureFlags', () => require('shared/ReactNativeCSFeatureFlags')); +jest.mock('shared/ReactFeatureFlags', () => require('react-cs-renderer/src/ReactNativeCSFeatureFlags')); describe('ReactNativeCS', () => { beforeEach(() => { diff --git a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js index 0486a2a48ca7..1e04f9afa0e2 100644 --- a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js +++ b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js @@ -63,10 +63,10 @@ describe('ReactBrowserEventEmitter', () => { EventPluginRegistry = require('shared/event/EventPluginRegistry'); React = require('react'); ReactDOM = require('react-dom'); - ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); - ReactBrowserEventEmitter = require('../client/event/ReactBrowserEventEmitter'); + ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); + ReactBrowserEventEmitter = require('react-dom/src/client/event/ReactBrowserEventEmitter'); ReactTestUtils = require('react-dom/test-utils'); - TapEventPlugin = require('../client/event/plugins/TapEventPlugin'); + TapEventPlugin = require('react-dom/src/client/event/plugins/TapEventPlugin'); var container = document.createElement('div'); diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js index b0f205a14850..c16c4a8fdd3a 100644 --- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js @@ -27,7 +27,7 @@ describe('ReactDOMComponent', () => { ReactDOMServer = require('react-dom/server'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - inputValueTracking = require('../client/inputValueTracking'); + inputValueTracking = require('react-dom/src/client/inputValueTracking'); }); describe('updateDOM', () => { diff --git a/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js b/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js index 366cedd08d3d..1ff250f2569e 100644 --- a/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js @@ -34,7 +34,7 @@ describe('ReactDOMComponentTree', () => { React = require('react'); ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); + ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); ReactDOMServer = require('react-dom/server'); }); diff --git a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js index e3ddbffb6acb..1c2d9f793c57 100644 --- a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js @@ -24,8 +24,8 @@ describe('ReactDOMEventListener', () => { React = require('react'); ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); - ReactDOMEventListener = require('../client/event/ReactDOMEventListener'); + ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); + ReactDOMEventListener = require('react-dom/src/client/event/ReactDOMEventListener'); ReactTestUtils = require('react-dom/test-utils'); handleTopLevel = jest.fn(); diff --git a/packages/react-dom/src/__tests__/ReactDOMSelection-test.js b/packages/react-dom/src/__tests__/ReactDOMSelection-test.js index 74ff592b0ab7..3c80c40018ed 100644 --- a/packages/react-dom/src/__tests__/ReactDOMSelection-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMSelection-test.js @@ -20,7 +20,7 @@ describe('ReactDOMSelection', () => { beforeEach(() => { React = require('react'); ReactDOM = require('react-dom'); - ReactDOMSelection = require('../client/ReactDOMSelection'); + ReactDOMSelection = require('react-dom/src/client/ReactDOMSelection'); invariant = require('fbjs/lib/invariant'); ({getModernOffsetsFromPoints} = ReactDOMSelection); diff --git a/packages/react-dom/src/__tests__/ReactMount-test.js b/packages/react-dom/src/__tests__/ReactMount-test.js index b14143dba346..169a121e2f6e 100644 --- a/packages/react-dom/src/__tests__/ReactMount-test.js +++ b/packages/react-dom/src/__tests__/ReactMount-test.js @@ -9,7 +9,7 @@ 'use strict'; -const {COMMENT_NODE} = require('../shared/HTMLNodeType'); +const {COMMENT_NODE} = require('react-dom/src/shared/HTMLNodeType'); const invariant = require('invariant'); diff --git a/packages/react-dom/src/__tests__/ReactServerRendering-test.js b/packages/react-dom/src/__tests__/ReactServerRendering-test.js index d424b5df8a1d..4833f51c29ac 100644 --- a/packages/react-dom/src/__tests__/ReactServerRendering-test.js +++ b/packages/react-dom/src/__tests__/ReactServerRendering-test.js @@ -34,7 +34,7 @@ describe('ReactDOMServer', () => { ExecutionEnvironment.canUseDOM = false; ReactDOMServer = require('react-dom/server'); - var DOMProperty = require('../shared/DOMProperty'); + var DOMProperty = require('react-dom/src/shared/DOMProperty'); ROOT_ATTRIBUTE_NAME = DOMProperty.ROOT_ATTRIBUTE_NAME; }); diff --git a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js index 7afd0987d590..bf9e396670c4 100644 --- a/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js +++ b/packages/react-dom/src/__tests__/ReactTreeTraversal-test.js @@ -11,7 +11,7 @@ var React = require('react'); // TODO: can we express this test with only public API? -var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); +var ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); var ReactTestUtils = require('react-dom/test-utils'); /** diff --git a/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js b/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js index cd2bfedaed77..7fdfcb6f50c6 100644 --- a/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js +++ b/packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js @@ -11,7 +11,7 @@ describe('escapeTextContentForBrowser', () => { // TODO: can we express this test with only public API? - var escapeTextContentForBrowser = require('../shared/escapeTextContentForBrowser'); + var escapeTextContentForBrowser = require('react-dom/src/shared/escapeTextContentForBrowser'); it('should escape boolean to string', () => { expect(escapeTextContentForBrowser(true)).toBe('true'); diff --git a/packages/react-dom/src/__tests__/inputValueTracking-test.js b/packages/react-dom/src/__tests__/inputValueTracking-test.js index c7805559838b..7217b068be71 100644 --- a/packages/react-dom/src/__tests__/inputValueTracking-test.js +++ b/packages/react-dom/src/__tests__/inputValueTracking-test.js @@ -13,7 +13,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); var ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? -var inputValueTracking = require('../client/inputValueTracking'); +var inputValueTracking = require('react-dom/src/client/inputValueTracking'); var getTracker = inputValueTracking._getTrackerFromNode; diff --git a/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js b/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js index 75300623f61a..e96ca1919768 100644 --- a/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js +++ b/packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js @@ -11,7 +11,7 @@ describe('quoteAttributeValueForBrowser', () => { // TODO: can we express this test with only public API? - var quoteAttributeValueForBrowser = require('../shared/quoteAttributeValueForBrowser'); + var quoteAttributeValueForBrowser = require('react-dom/src/shared/quoteAttributeValueForBrowser'); it('should escape boolean to string', () => { expect(quoteAttributeValueForBrowser(true)).toBe('"true"'); diff --git a/packages/react-dom/src/__tests__/validateDOMNesting-test.js b/packages/react-dom/src/__tests__/validateDOMNesting-test.js index f317c211582b..da7b7ea60509 100644 --- a/packages/react-dom/src/__tests__/validateDOMNesting-test.js +++ b/packages/react-dom/src/__tests__/validateDOMNesting-test.js @@ -136,7 +136,7 @@ describe('ReactContextValidator', () => { jest.resetModules(); // TODO: can we express this test with only public API? - validateDOMNesting = require('../client/validateDOMNesting'); + validateDOMNesting = require('react-dom/src/client/validateDOMNesting'); }); it('allows any tag with no context', () => { diff --git a/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js b/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js index 05f07f572659..eb625a045443 100644 --- a/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js +++ b/packages/react-dom/src/client/__tests__/getNodeForCharacterOffset-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getNodeForCharacterOffset = require('../getNodeForCharacterOffset'); +var getNodeForCharacterOffset = require('react-dom/src/client/getNodeForCharacterOffset'); // Create node from HTML string function createNode(html) { diff --git a/packages/react-dom/src/client/__tests__/setInnerHTML-test.js b/packages/react-dom/src/client/__tests__/setInnerHTML-test.js index 70b52f25c5c9..193a8c57a05a 100644 --- a/packages/react-dom/src/client/__tests__/setInnerHTML-test.js +++ b/packages/react-dom/src/client/__tests__/setInnerHTML-test.js @@ -10,8 +10,8 @@ 'use strict'; // TODO: can we express this test with only public API? -var setInnerHTML = require('../setInnerHTML'); -var Namespaces = require('../../shared/DOMNamespaces').Namespaces; +var setInnerHTML = require('react-dom/src/client/setInnerHTML'); +var Namespaces = require('react-dom/src/shared/DOMNamespaces').Namespaces; describe('setInnerHTML', () => { describe('when the node has innerHTML property', () => { diff --git a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js index b34db2e542aa..d00f81e800ff 100644 --- a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js @@ -49,10 +49,10 @@ describe('BeforeInputEventPlugin', function() { this.ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? - this.ReactDOMComponentTree = require('../../../ReactDOMComponentTree'); - this.SyntheticCompositionEvent = require('../../SyntheticCompositionEvent'); - this.SyntheticInputEvent = require('../../SyntheticInputEvent'); - this.BeforeInputEventPlugin = require('../BeforeInputEventPlugin'); + this.ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); + this.SyntheticCompositionEvent = require('react-dom/src/client/event/SyntheticCompositionEvent'); + this.SyntheticInputEvent = require('react-dom/src/client/event/SyntheticInputEvent'); + this.BeforeInputEventPlugin = require('react-dom/src/client/event/plugins/BeforeInputEventPlugin'); } function extract(node, eventType, optionalData) { diff --git a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js index 9e88452f06fb..9af37c644eb9 100644 --- a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js @@ -13,8 +13,8 @@ var React = require('react'); var ReactDOM = require('react-dom'); var ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? -var ChangeEventPlugin = require('../ChangeEventPlugin'); -var inputValueTracking = require('../../../inputValueTracking'); +var ChangeEventPlugin = require('react-dom/src/client/event/plugins/ChangeEventPlugin'); +var inputValueTracking = require('react-dom/src/client/inputValueTracking'); function getTrackedValue(elem) { var tracker = inputValueTracking._getTrackerFromNode(elem); diff --git a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js index cc261126d1c2..38121ba48cd8 100644 --- a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js @@ -23,8 +23,8 @@ describe('EnterLeaveEventPlugin', () => { ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('../../../ReactDOMComponentTree'); - EnterLeaveEventPlugin = require('../EnterLeaveEventPlugin'); + ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); + EnterLeaveEventPlugin = require('react-dom/src/client/event/plugins/EnterLeaveEventPlugin'); }); it('should set relatedTarget properly in iframe', () => { diff --git a/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js index 36fdbdad9d60..0420d73bc1fb 100644 --- a/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js +++ b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js @@ -16,7 +16,7 @@ describe('FallbackCompositionState', () => { beforeEach(() => { // TODO: can we express this test with only public API? - FallbackCompositionState = require('../FallbackCompositionState'); + FallbackCompositionState = require('react-dom/src/client/event/plugins/FallbackCompositionState'); }); function getInput() { diff --git a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js index 03c915f0defe..2ae0e4e42712 100644 --- a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js @@ -30,8 +30,8 @@ describe('SelectEventPlugin', () => { ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - ReactDOMComponentTree = require('../../../ReactDOMComponentTree'); - SelectEventPlugin = require('../SelectEventPlugin'); + ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); + SelectEventPlugin = require('react-dom/src/client/event/plugins/SelectEventPlugin'); }); it('should skip extraction if no listeners are present', () => { diff --git a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js index b0e2f63a0494..5e33eba008b7 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js @@ -16,9 +16,9 @@ describe('SyntheticClipboardEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticClipboardEvent = require('../SyntheticClipboardEvent'); + SyntheticClipboardEvent = require('react-dom/src/client/event/SyntheticClipboardEvent'); createEvent = function(nativeEvent) { - var target = require('../getEventTarget')(nativeEvent); + var target = require('react-dom/src/client/event/getEventTarget')(nativeEvent); return SyntheticClipboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js index 9abc77ea8687..193870ab4e2c 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js @@ -25,7 +25,7 @@ describe('SyntheticEvent', () => { ReactTestUtils = require('react-dom/test-utils'); createEvent = function(nativeEvent) { - var target = require('../getEventTarget')(nativeEvent); + var target = require('react-dom/src/client/event/getEventTarget')(nativeEvent); return SyntheticEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js index ab3e40262079..8f90e30b1d8a 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js @@ -17,13 +17,13 @@ describe('SyntheticKeyboardEvent', () => { beforeEach(() => { // Mock getEventCharCode for proper unit testing - jest.mock('../getEventCharCode'); - getEventCharCode = require('../getEventCharCode'); + jest.mock('react-dom/src/client/event/getEventCharCode'); + getEventCharCode = require('react-dom/src/client/event/getEventCharCode'); // TODO: can we express this test with only public API? - SyntheticKeyboardEvent = require('../SyntheticKeyboardEvent'); + SyntheticKeyboardEvent = require('react-dom/src/client/event/SyntheticKeyboardEvent'); createEvent = function(nativeEvent) { - var target = require('../getEventTarget')(nativeEvent); + var target = require('react-dom/src/client/event/getEventTarget')(nativeEvent); return SyntheticKeyboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js index 229a93f68fe5..299d3c3f7711 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js @@ -16,10 +16,10 @@ describe('SyntheticWheelEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticWheelEvent = require('../SyntheticWheelEvent'); + SyntheticWheelEvent = require('react-dom/src/client/event/SyntheticWheelEvent'); createEvent = function(nativeEvent) { - var target = require('../getEventTarget')(nativeEvent); + var target = require('react-dom/src/client/event/getEventTarget')(nativeEvent); return SyntheticWheelEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/getEventCharCode-test.js b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js index 3787151c4727..e87ff069a413 100644 --- a/packages/react-dom/src/events/__tests__/getEventCharCode-test.js +++ b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getEventCharCode = require('../getEventCharCode'); +var getEventCharCode = require('react-dom/src/client/event/getEventCharCode'); describe('getEventCharCode', () => { describe('when charCode is present in nativeEvent', () => { diff --git a/packages/react-dom/src/events/__tests__/getEventKey-test.js b/packages/react-dom/src/events/__tests__/getEventKey-test.js index 4942911d4389..0223685a436b 100644 --- a/packages/react-dom/src/events/__tests__/getEventKey-test.js +++ b/packages/react-dom/src/events/__tests__/getEventKey-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getEventKey = require('../getEventKey'); +var getEventKey = require('react-dom/src/client/event/getEventKey'); describe('getEventKey', () => { describe('when key is implemented in a browser', () => { diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index b6d91623985c..4f72a12a825a 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -29,7 +29,7 @@ const findNumericNodeHandle = require('./findNumericNodeHandle'); import type {ReactNativeType} from 'ReactNativeTypes'; import type {ReactNodeList} from 'ReactTypes'; -require('ReactNativeInjection'); +require('./ReactNativeInjection'); ReactGenericBatching.injection.injectFiberBatchedUpdates( ReactNativeFiberRenderer.batchedUpdates, diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js index 99135d8b570e..124e26a4e1c4 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeAttributePayload-test.js @@ -7,8 +7,8 @@ */ 'use strict'; -var ReactNativeAttributePayload = require('../ReactNativeAttributePayload'); -var ReactNativePropRegistry = require('../ReactNativePropRegistry'); +var ReactNativeAttributePayload = require('react-native-renderer/src/ReactNativeAttributePayload'); +var ReactNativePropRegistry = require('react-native-renderer/src/ReactNativePropRegistry'); var diff = ReactNativeAttributePayload.diff; diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js index 3beeb5f439bf..6a23e5a43c90 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js @@ -69,10 +69,10 @@ beforeEach(() => { RCTEventEmitter = require('RCTEventEmitter'); React = require('react'); ReactNative = require('react-native-renderer'); - ReactNativeBridgeEventPlugin = require('../ReactNativeBridgeEventPlugin'); + ReactNativeBridgeEventPlugin = require('react-native-renderer/src/ReactNativeBridgeEventPlugin'); ResponderEventPlugin = require('shared/event/plugins/ResponderEventPlugin'); UIManager = require('UIManager'); - createReactNativeComponentClass = require('../createReactNativeComponentClass'); + createReactNativeComponentClass = require('react-native-renderer/src/createReactNativeComponentClass'); }); it('fails if unknown/unsupported event types are dispatched', () => { diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js index 8f6e5b63326b..374fea72b9e2 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeMount-test.js @@ -21,7 +21,7 @@ describe('ReactNative', () => { React = require('react'); ReactNative = require('react-native-renderer'); UIManager = require('UIManager'); - createReactNativeComponentClass = require('../createReactNativeComponentClass'); + createReactNativeComponentClass = require('react-native-renderer/src/createReactNativeComponentClass'); }); it('should be able to create and render a native component', () => { diff --git a/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js b/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js index aba3b8acc286..70166d57ecde 100644 --- a/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js +++ b/packages/react-native-renderer/src/__tests__/createReactNativeComponentClass-test.js @@ -17,7 +17,7 @@ describe('createReactNativeComponentClass', () => { beforeEach(() => { jest.resetModules(); - createReactNativeComponentClass = require('../createReactNativeComponentClass'); + createReactNativeComponentClass = require('react-native-renderer/src/createReactNativeComponentClass'); React = require('react'); ReactNative = require('react-native-renderer'); }); diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js index 38dba350c55c..f7a28614a5bc 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js +++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js @@ -116,8 +116,8 @@ describe('ReactDebugFiberPerf', () => { React = require('react'); ReactNoop = require('react-noop-renderer'); // TODO: can we express this test with only public API? - ReactCoroutine = require('../isomorphic/ReactCoroutine'); - ReactPortal = require('../isomorphic/ReactPortal'); + ReactCoroutine = require('react-reconciler/src/isomorphic/ReactCoroutine'); + ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); PropTypes = require('prop-types'); }); diff --git a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js index 61fae0ec1211..a8d8a6eec806 100644 --- a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js +++ b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js @@ -24,7 +24,7 @@ describe('ReactPersistent', () => { React = require('react'); ReactNoop = require('react-noop-renderer'); - ReactPortal = require('../isomorphic/ReactPortal'); + ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); }); const DEFAULT_ROOT_ID = 'persistent-test'; diff --git a/packages/shared/__tests__/ReactErrorUtils-test.js b/packages/shared/__tests__/ReactErrorUtils-test.js index 6f6d09b07b6e..dca4cef43a10 100644 --- a/packages/shared/__tests__/ReactErrorUtils-test.js +++ b/packages/shared/__tests__/ReactErrorUtils-test.js @@ -14,7 +14,7 @@ var ReactErrorUtils; describe('ReactErrorUtils', () => { beforeEach(() => { // TODO: can we express this test with only public API? - ReactErrorUtils = require('../ReactErrorUtils'); + ReactErrorUtils = require('shared/ReactErrorUtils'); }); // Run tests in both DEV and production @@ -36,7 +36,7 @@ describe('ReactErrorUtils', () => { }; jest.resetModules(); - ReactErrorUtils = require('../ReactErrorUtils'); + ReactErrorUtils = require('shared/ReactErrorUtils'); }); afterEach(() => { @@ -161,9 +161,9 @@ describe('ReactErrorUtils', () => { }); it('handles nested errors in separate renderers', () => { - const ReactErrorUtils1 = require('../ReactErrorUtils'); + const ReactErrorUtils1 = require('shared/ReactErrorUtils'); jest.resetModules(); - const ReactErrorUtils2 = require('../ReactErrorUtils'); + const ReactErrorUtils2 = require('shared/ReactErrorUtils'); expect(ReactErrorUtils1).not.toEqual(ReactErrorUtils2); let ops = []; diff --git a/packages/shared/__tests__/reactProdInvariant-test.js b/packages/shared/__tests__/reactProdInvariant-test.js index 31689d4cbeab..7cd2e88a7863 100644 --- a/packages/shared/__tests__/reactProdInvariant-test.js +++ b/packages/shared/__tests__/reactProdInvariant-test.js @@ -13,7 +13,7 @@ var reactProdInvariant; describe('reactProdInvariant', () => { beforeEach(() => { jest.resetModules(); - reactProdInvariant = require('../reactProdInvariant'); + reactProdInvariant = require('shared/reactProdInvariant'); }); it('should throw with the correct number of `%s`s in the URL', () => { From 20c853851eb92eb3609b84f6c8d18438fe6fed8f Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 19:09:20 +0100 Subject: [PATCH 07/29] Prettier --- packages/react-cs-renderer/src/ReactNativeCS.js | 4 +++- .../react-cs-renderer/src/__tests__/ReactNativeCS-test.js | 4 +++- packages/react-dom/src/client/ReactDOMFiberComponent.js | 8 ++++++-- packages/react-dom/src/client/ReactDOMFiberInput.js | 8 ++++++-- packages/react-dom/src/client/ReactDOMFiberSelect.js | 8 ++++++-- packages/react-dom/src/client/ReactDOMFiberTextarea.js | 4 +++- packages/react-dom/src/client/validateDOMNesting.js | 4 +++- .../src/events/__tests__/SyntheticClipboardEvent-test.js | 4 +++- .../react-dom/src/events/__tests__/SyntheticEvent-test.js | 4 +++- .../src/events/__tests__/SyntheticKeyboardEvent-test.js | 4 +++- .../src/events/__tests__/SyntheticWheelEvent-test.js | 4 +++- .../src/ReactNativeFiberHostComponent.js | 5 ++++- .../react-native-renderer/src/ReactNativeInjection.js | 2 +- packages/react-native-renderer/src/ReactNativeRenderer.js | 4 +++- packages/react-reconciler/src/ReactChildFiber.js | 5 ++++- packages/react-rt-renderer/src/ReactNativeRT.js | 4 +++- 16 files changed, 57 insertions(+), 19 deletions(-) diff --git a/packages/react-cs-renderer/src/ReactNativeCS.js b/packages/react-cs-renderer/src/ReactNativeCS.js index 9e7f0b85cd86..d89ebd735ea8 100644 --- a/packages/react-cs-renderer/src/ReactNativeCS.js +++ b/packages/react-cs-renderer/src/ReactNativeCS.js @@ -13,7 +13,9 @@ const ReactGenericBatching = require('shared/event/ReactGenericBatching'); const ReactVersion = require('shared/ReactVersion'); // TODO: direct imports like some-package/src/* are bad. Fix me. -const {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); +const { + injectInternals, +} = require('react-reconciler/src/ReactFiberDevToolsHook'); import type {ReactNativeCSType} from 'ReactNativeCSTypes'; diff --git a/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js b/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js index 1ab109be10bc..dd779a10bd99 100644 --- a/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js +++ b/packages/react-cs-renderer/src/__tests__/ReactNativeCS-test.js @@ -12,7 +12,9 @@ var React; var ReactNativeCS; -jest.mock('shared/ReactFeatureFlags', () => require('react-cs-renderer/src/ReactNativeCSFeatureFlags')); +jest.mock('shared/ReactFeatureFlags', () => + require('react-cs-renderer/src/ReactNativeCSFeatureFlags'), +); describe('ReactNativeCS', () => { beforeEach(() => { diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js index 650febb5fb6d..eed71b7628b8 100644 --- a/packages/react-dom/src/client/ReactDOMFiberComponent.js +++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js @@ -22,7 +22,9 @@ 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 { + getCurrentFiberOwnerName, +} = require('react-reconciler/src/ReactDebugCurrentFiber'); var {DOCUMENT_NODE, DOCUMENT_FRAGMENT_NODE} = require('../shared/HTMLNodeType'); @@ -36,7 +38,9 @@ var setTextContent = require('./setTextContent'); 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 { + getCurrentFiberStackAddendum, + } = require('react-reconciler/src/ReactDebugCurrentFiber'); 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 0bcbf6f3d8b7..276f502392ed 100644 --- a/packages/react-dom/src/client/ReactDOMFiberInput.js +++ b/packages/react-dom/src/client/ReactDOMFiberInput.js @@ -23,11 +23,15 @@ var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropT var ReactDOMComponentTree = require('./ReactDOMComponentTree'); // TODO: direct imports like some-package/src/* are bad. Fix me. -var {getCurrentFiberOwnerName} = require('react-reconciler/src/ReactDebugCurrentFiber'); +var { + getCurrentFiberOwnerName, +} = require('react-reconciler/src/ReactDebugCurrentFiber'); if (__DEV__) { // TODO: direct imports like some-package/src/* are bad. Fix me. - var {getCurrentFiberStackAddendum} = require('react-reconciler/src/ReactDebugCurrentFiber'); + var { + getCurrentFiberStackAddendum, + } = require('react-reconciler/src/ReactDebugCurrentFiber'); var warning = require('fbjs/lib/warning'); } diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js index 5439c060d484..9023b8822edd 100644 --- a/packages/react-dom/src/client/ReactDOMFiberSelect.js +++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js @@ -18,13 +18,17 @@ type SelectWithWrapperState = HTMLSelectElement & { }; var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); -var {getCurrentFiberOwnerName} = require('react-reconciler/src/ReactDebugCurrentFiber'); +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'); + var { + getCurrentFiberStackAddendum, + } = require('react-reconciler/src/ReactDebugCurrentFiber'); } function getDeclarationErrorAddendum() { diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js index b205c69f7c8a..656735a63ad2 100644 --- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js +++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js @@ -23,7 +23,9 @@ 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 { + getCurrentFiberStackAddendum, + } = require('react-reconciler/src/ReactDebugCurrentFiber'); } var didWarnValDefaultVal = false; diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js index 9eb7287e9058..3af6a32a8934 100644 --- a/packages/react-dom/src/client/validateDOMNesting.js +++ b/packages/react-dom/src/client/validateDOMNesting.js @@ -16,7 +16,9 @@ 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 { + getCurrentFiberStackAddendum, + } = require('react-reconciler/src/ReactDebugCurrentFiber'); // 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/__tests__/SyntheticClipboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js index 5e33eba008b7..5acd7acc7ad5 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js @@ -18,7 +18,9 @@ describe('SyntheticClipboardEvent', () => { // TODO: can we express this test with only public API? SyntheticClipboardEvent = require('react-dom/src/client/event/SyntheticClipboardEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/client/event/getEventTarget')(nativeEvent); + var target = require('react-dom/src/client/event/getEventTarget')( + nativeEvent, + ); return SyntheticClipboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js index 193870ab4e2c..fd1552b5bd11 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js @@ -25,7 +25,9 @@ describe('SyntheticEvent', () => { ReactTestUtils = require('react-dom/test-utils'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/client/event/getEventTarget')(nativeEvent); + var target = require('react-dom/src/client/event/getEventTarget')( + nativeEvent, + ); return SyntheticEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js index 8f90e30b1d8a..2e1f4523bd95 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js @@ -23,7 +23,9 @@ describe('SyntheticKeyboardEvent', () => { // TODO: can we express this test with only public API? SyntheticKeyboardEvent = require('react-dom/src/client/event/SyntheticKeyboardEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/client/event/getEventTarget')(nativeEvent); + var target = require('react-dom/src/client/event/getEventTarget')( + nativeEvent, + ); return SyntheticKeyboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js index 299d3c3f7711..0c4598cb2386 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js @@ -19,7 +19,9 @@ describe('SyntheticWheelEvent', () => { SyntheticWheelEvent = require('react-dom/src/client/event/SyntheticWheelEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/client/event/getEventTarget')(nativeEvent); + var target = require('react-dom/src/client/event/getEventTarget')( + nativeEvent, + ); return SyntheticWheelEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js index 5716b5ba44be..9cea7a68bf2d 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js +++ b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js @@ -16,7 +16,10 @@ var ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); var TextInputState = require('TextInputState'); var UIManager = require('UIManager'); -var {mountSafeCallback, warnForStyleProps} = require('./NativeMethodsMixinUtils'); +var { + mountSafeCallback, + warnForStyleProps, +} = require('./NativeMethodsMixinUtils'); import type { MeasureInWindowOnSuccessCallback, diff --git a/packages/react-native-renderer/src/ReactNativeInjection.js b/packages/react-native-renderer/src/ReactNativeInjection.js index 793b43352ee0..db306dca2195 100644 --- a/packages/react-native-renderer/src/ReactNativeInjection.js +++ b/packages/react-native-renderer/src/ReactNativeInjection.js @@ -15,7 +15,7 @@ * ensures it exists in the dependency graph and can be `require`d. * TODO: require this in packager, not in React #10932517 */ - // Module provided by RN: +// Module provided by RN: require('InitializeCore'); var EventPluginHub = require('shared/event/EventPluginHub'); diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index 4f72a12a825a..0fab47fe34b0 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -12,7 +12,9 @@ // TODO: direct imports like some-package/src/* are bad. Fix me. const ReactFiberErrorLogger = require('react-reconciler/src/ReactFiberErrorLogger'); const ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); -const {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); +const { + injectInternals, +} = require('react-reconciler/src/ReactFiberDevToolsHook'); const ReactGenericBatching = require('shared/event/ReactGenericBatching'); const ReactNativeFiberErrorDialog = require('./ReactNativeFiberErrorDialog'); diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 31ccc4e095d0..e48bf7e12058 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -15,7 +15,10 @@ import type {ReactCoroutine, ReactPortal, ReactYield} from 'ReactTypes'; import type {Fiber} from 'ReactFiber'; import type {ExpirationTime} from 'ReactFiberExpirationTime'; -var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('./isomorphic/ReactCoroutine'); +var { + REACT_COROUTINE_TYPE, + REACT_YIELD_TYPE, +} = require('./isomorphic/ReactCoroutine'); var {REACT_PORTAL_TYPE} = require('./isomorphic/ReactPortal'); var ReactFiber = require('./ReactFiber'); diff --git a/packages/react-rt-renderer/src/ReactNativeRT.js b/packages/react-rt-renderer/src/ReactNativeRT.js index fc2189ae5341..f5afd158c18f 100644 --- a/packages/react-rt-renderer/src/ReactNativeRT.js +++ b/packages/react-rt-renderer/src/ReactNativeRT.js @@ -14,7 +14,9 @@ const ReactFiberErrorLogger = require('react-reconciler/src/ReactFiberErrorLogger'); const ReactNativeFiberErrorDialog = require('react-native-renderer/src/ReactNativeFiberErrorDialog'); const ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); -const {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); +const { + injectInternals, +} = require('react-reconciler/src/ReactFiberDevToolsHook'); const ReactGenericBatching = require('shared/event/ReactGenericBatching'); const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); From 81f6675cbf30c0c1681fe5f03e2ddff8debcd730 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 19:19:02 +0100 Subject: [PATCH 08/29] Remove @providesModule --- packages/events/EventPluginHub.js | 2 -- packages/events/EventPluginRegistry.js | 1 - packages/events/EventPluginUtils.js | 2 -- packages/events/EventPropagators.js | 2 -- packages/events/PluginModuleType.js | 1 - packages/events/ReactControlledComponent.js | 2 -- packages/events/ReactEventEmitterMixin.js | 2 -- packages/events/ReactGenericBatching.js | 2 -- packages/events/ReactSyntheticEventType.js | 2 -- packages/events/ResponderEventPlugin.js | 2 -- packages/events/ResponderSyntheticEvent.js | 2 -- packages/events/ResponderTouchHistoryStore.js | 1 - packages/events/SyntheticEvent.js | 2 -- packages/events/accumulate.js | 1 - packages/events/accumulateInto.js | 1 - packages/events/forEachAccumulated.js | 1 - packages/react-art/npm/Circle.js | 2 -- packages/react-art/npm/Rectangle.js | 2 -- packages/react-art/npm/Wedge.js | 2 -- packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js | 1 - packages/react-cs-renderer/src/ReactNativeCSTypes.js | 1 - packages/react-dom/src/client/DOMPropertyOperations.js | 2 -- packages/react-dom/src/client/ReactDOMClientInjection.js | 2 -- packages/react-dom/src/client/ReactDOMComponentTree.js | 2 -- packages/react-dom/src/client/ReactDOMFiberComponent.js | 1 - packages/react-dom/src/client/ReactDOMFiberInput.js | 1 - packages/react-dom/src/client/ReactDOMFiberOption.js | 1 - packages/react-dom/src/client/ReactDOMFiberSelect.js | 1 - packages/react-dom/src/client/ReactDOMFiberTextarea.js | 1 - packages/react-dom/src/client/ReactDOMSelection.js | 2 -- packages/react-dom/src/client/ReactInputSelection.js | 2 -- packages/react-dom/src/client/getNodeForCharacterOffset.js | 2 -- packages/react-dom/src/client/getTextContentAccessor.js | 2 -- packages/react-dom/src/client/inputValueTracking.js | 1 - packages/react-dom/src/client/setInnerHTML.js | 2 -- packages/react-dom/src/client/setTextContent.js | 2 -- packages/react-dom/src/client/validateDOMNesting.js | 2 -- packages/react-dom/src/events/BeforeInputEventPlugin.js | 2 -- packages/react-dom/src/events/BrowserEventConstants.js | 2 -- packages/react-dom/src/events/ChangeEventPlugin.js | 2 -- packages/react-dom/src/events/DOMEventPluginOrder.js | 2 -- packages/react-dom/src/events/EnterLeaveEventPlugin.js | 2 -- packages/react-dom/src/events/FallbackCompositionState.js | 2 -- packages/react-dom/src/events/ReactBrowserEventEmitter.js | 2 -- packages/react-dom/src/events/ReactDOMEventListener.js | 2 -- packages/react-dom/src/events/SelectEventPlugin.js | 2 -- packages/react-dom/src/events/SimpleEventPlugin.js | 1 - packages/react-dom/src/events/SyntheticAnimationEvent.js | 2 -- packages/react-dom/src/events/SyntheticClipboardEvent.js | 2 -- packages/react-dom/src/events/SyntheticCompositionEvent.js | 2 -- packages/react-dom/src/events/SyntheticDragEvent.js | 2 -- packages/react-dom/src/events/SyntheticFocusEvent.js | 2 -- packages/react-dom/src/events/SyntheticInputEvent.js | 2 -- packages/react-dom/src/events/SyntheticKeyboardEvent.js | 2 -- packages/react-dom/src/events/SyntheticMouseEvent.js | 2 -- packages/react-dom/src/events/SyntheticTouchEvent.js | 2 -- packages/react-dom/src/events/SyntheticTransitionEvent.js | 2 -- packages/react-dom/src/events/SyntheticUIEvent.js | 2 -- packages/react-dom/src/events/SyntheticWheelEvent.js | 2 -- packages/react-dom/src/events/TapEventPlugin.js | 1 - packages/react-dom/src/events/getEventCharCode.js | 2 -- packages/react-dom/src/events/getEventKey.js | 2 -- packages/react-dom/src/events/getEventModifierState.js | 2 -- packages/react-dom/src/events/getEventTarget.js | 2 -- packages/react-dom/src/events/getVendorPrefixedEventName.js | 2 -- packages/react-dom/src/events/isEventSupported.js | 2 -- packages/react-dom/src/server/DOMMarkupOperations.js | 2 -- packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js | 2 -- packages/react-dom/src/server/ReactDOMStringRenderer.js | 2 -- packages/react-dom/src/server/ReactPartialRenderer.js | 2 -- packages/react-dom/src/shared/CSSProperty.js | 2 -- packages/react-dom/src/shared/CSSPropertyOperations.js | 2 -- packages/react-dom/src/shared/DOMNamespaces.js | 2 -- packages/react-dom/src/shared/DOMProperty.js | 2 -- packages/react-dom/src/shared/HTMLDOMPropertyConfig.js | 2 -- packages/react-dom/src/shared/HTMLNodeType.js | 2 -- packages/react-dom/src/shared/ReactControlledValuePropTypes.js | 2 -- packages/react-dom/src/shared/ReactDOMInjection.js | 2 -- packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js | 2 -- packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js | 2 -- packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js | 2 -- packages/react-dom/src/shared/SVGDOMPropertyConfig.js | 2 -- packages/react-dom/src/shared/assertValidProps.js | 2 -- packages/react-dom/src/shared/checkReact.js | 1 - .../react-dom/src/shared/createMicrosoftUnsafeLocalFunction.js | 2 -- packages/react-dom/src/shared/dangerousStyleValue.js | 2 -- packages/react-dom/src/shared/escapeTextContentForBrowser.js | 2 -- packages/react-dom/src/shared/isCustomComponent.js | 1 - packages/react-dom/src/shared/omittedCloseTags.js | 2 -- packages/react-dom/src/shared/possibleStandardNames.js | 2 -- packages/react-dom/src/shared/quoteAttributeValueForBrowser.js | 2 -- packages/react-dom/src/shared/validAriaProperties.js | 2 -- packages/react-dom/src/shared/voidElementTags.js | 2 -- packages/react-dom/src/shared/warnValidStyle.js | 2 -- packages/react-native-renderer/src/NativeMethodsMixin.js | 1 - packages/react-native-renderer/src/NativeMethodsMixinUtils.js | 1 - .../react-native-renderer/src/ReactNativeAttributePayload.js | 1 - .../react-native-renderer/src/ReactNativeBridgeEventPlugin.js | 1 - packages/react-native-renderer/src/ReactNativeComponent.js | 1 - packages/react-native-renderer/src/ReactNativeComponentTree.js | 2 -- packages/react-native-renderer/src/ReactNativeEventEmitter.js | 1 - .../react-native-renderer/src/ReactNativeEventPluginOrder.js | 1 - .../react-native-renderer/src/ReactNativeFiberErrorDialog.js | 1 - .../react-native-renderer/src/ReactNativeFiberHostComponent.js | 1 - packages/react-native-renderer/src/ReactNativeFiberInspector.js | 1 - packages/react-native-renderer/src/ReactNativeFiberRenderer.js | 1 - .../src/ReactNativeGlobalResponderHandler.js | 2 -- packages/react-native-renderer/src/ReactNativeInjection.js | 1 - packages/react-native-renderer/src/ReactNativePropRegistry.js | 1 - packages/react-native-renderer/src/ReactNativeTagHandles.js | 1 - packages/react-native-renderer/src/ReactNativeTypes.js | 1 - .../react-native-renderer/src/ReactNativeViewConfigRegistry.js | 1 - .../src/createReactNativeComponentClass.js | 1 - packages/react-native-renderer/src/findNodeHandle.js | 1 - packages/react-native-renderer/src/findNumericNodeHandle.js | 1 - packages/react-native-renderer/src/takeSnapshot.js | 1 - packages/react-noop-renderer/src/ReactNoop.js | 1 - packages/react-reconciler/src/ReactChildFiber.js | 1 - packages/react-reconciler/src/ReactCoroutine.js | 1 - packages/react-reconciler/src/ReactDebugCurrentFiber.js | 1 - packages/react-reconciler/src/ReactDebugFiberPerf.js | 1 - packages/react-reconciler/src/ReactFiber.js | 1 - packages/react-reconciler/src/ReactFiberBeginWork.js | 1 - packages/react-reconciler/src/ReactFiberClassComponent.js | 1 - packages/react-reconciler/src/ReactFiberCommitWork.js | 1 - packages/react-reconciler/src/ReactFiberCompleteWork.js | 1 - packages/react-reconciler/src/ReactFiberContext.js | 1 - packages/react-reconciler/src/ReactFiberDevToolsHook.js | 1 - packages/react-reconciler/src/ReactFiberErrorLogger.js | 1 - packages/react-reconciler/src/ReactFiberExpirationTime.js | 1 - packages/react-reconciler/src/ReactFiberHostContext.js | 1 - packages/react-reconciler/src/ReactFiberHydrationContext.js | 1 - packages/react-reconciler/src/ReactFiberInstrumentation.js | 1 - packages/react-reconciler/src/ReactFiberRoot.js | 1 - packages/react-reconciler/src/ReactFiberScheduler.js | 1 - packages/react-reconciler/src/ReactFiberStack.js | 1 - packages/react-reconciler/src/ReactFiberUpdateQueue.js | 1 - packages/react-reconciler/src/ReactPortal.js | 1 - packages/react-reconciler/src/ReactTypeOfInternalContext.js | 1 - packages/react-reconciler/src/ReactTypes.js | 1 - packages/react-rt-renderer/src/ReactNativeRT.js | 1 - packages/react-rt-renderer/src/ReactNativeRTComponentTree.js | 1 - packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js | 1 - packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js | 1 - packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js | 1 - packages/react-rt-renderer/src/ReactNativeRTTagHandles.js | 1 - packages/react-rt-renderer/src/ReactNativeRTTypes.js | 1 - packages/react/src/ReactBaseClasses.js | 2 -- packages/react/src/ReactChildren.js | 2 -- packages/react/src/ReactCurrentOwner.js | 1 - packages/react/src/ReactDebugCurrentFrame.js | 1 - packages/react/src/ReactElement.js | 2 -- packages/react/src/ReactElementValidator.js | 2 -- packages/react/src/ReactNoopUpdateQueue.js | 2 -- packages/react/src/onlyChild.js | 2 -- packages/shared/ReactDOMFrameScheduling.js | 1 - packages/shared/ReactErrorUtils.js | 1 - packages/shared/ReactFeatureFlags.js | 1 - packages/shared/ReactFiberTreeReflection.js | 1 - packages/shared/ReactGlobalSharedState.js | 2 -- packages/shared/ReactInstanceMap.js | 2 -- packages/shared/ReactTreeTraversal.js | 2 -- packages/shared/ReactTypeOfSideEffect.js | 1 - packages/shared/ReactTypeOfWork.js | 1 - packages/shared/ReactVersion.js | 2 -- packages/shared/getComponentName.js | 1 - packages/shared/isTextInputElement.js | 1 - packages/shared/lowPriorityWarning.js | 2 -- packages/shared/reactProdInvariant.js | 1 - packages/shared/validateCallback.js | 1 - 170 files changed, 259 deletions(-) diff --git a/packages/events/EventPluginHub.js b/packages/events/EventPluginHub.js index b362c880cf16..8219c1edf147 100644 --- a/packages/events/EventPluginHub.js +++ b/packages/events/EventPluginHub.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule EventPluginHub */ 'use strict'; diff --git a/packages/events/EventPluginRegistry.js b/packages/events/EventPluginRegistry.js index 4aa901c1d191..4046a71036c4 100644 --- a/packages/events/EventPluginRegistry.js +++ b/packages/events/EventPluginRegistry.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule EventPluginRegistry * @flow */ diff --git a/packages/events/EventPluginUtils.js b/packages/events/EventPluginUtils.js index 201fe7c87a6e..8a1533fd4dd6 100644 --- a/packages/events/EventPluginUtils.js +++ b/packages/events/EventPluginUtils.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule EventPluginUtils */ 'use strict'; diff --git a/packages/events/EventPropagators.js b/packages/events/EventPropagators.js index dd733e1b06e7..03cf9855d2a6 100644 --- a/packages/events/EventPropagators.js +++ b/packages/events/EventPropagators.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule EventPropagators */ 'use strict'; diff --git a/packages/events/PluginModuleType.js b/packages/events/PluginModuleType.js index ad9b90e78d73..6395a3499cbc 100644 --- a/packages/events/PluginModuleType.js +++ b/packages/events/PluginModuleType.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule PluginModuleType * @flow */ diff --git a/packages/events/ReactControlledComponent.js b/packages/events/ReactControlledComponent.js index 5ec27a4e879a..a89a2d01f394 100644 --- a/packages/events/ReactControlledComponent.js +++ b/packages/events/ReactControlledComponent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactControlledComponent */ 'use strict'; diff --git a/packages/events/ReactEventEmitterMixin.js b/packages/events/ReactEventEmitterMixin.js index 51b0ee5d675c..aeb0228887a1 100644 --- a/packages/events/ReactEventEmitterMixin.js +++ b/packages/events/ReactEventEmitterMixin.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactEventEmitterMixin */ 'use strict'; diff --git a/packages/events/ReactGenericBatching.js b/packages/events/ReactGenericBatching.js index 617bc9d86da7..8a3fcdb5a569 100644 --- a/packages/events/ReactGenericBatching.js +++ b/packages/events/ReactGenericBatching.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactGenericBatching */ 'use strict'; diff --git a/packages/events/ReactSyntheticEventType.js b/packages/events/ReactSyntheticEventType.js index 86c8a711aeb5..8032d5d59039 100644 --- a/packages/events/ReactSyntheticEventType.js +++ b/packages/events/ReactSyntheticEventType.js @@ -5,8 +5,6 @@ * LICENSE file in the root directory of this source tree. * * Flow type for SyntheticEvent class that includes private properties - * - * @providesModule ReactSyntheticEventType * @flow */ diff --git a/packages/events/ResponderEventPlugin.js b/packages/events/ResponderEventPlugin.js index 0c9e4a0699a1..2c12878338bc 100644 --- a/packages/events/ResponderEventPlugin.js +++ b/packages/events/ResponderEventPlugin.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ResponderEventPlugin */ 'use strict'; diff --git a/packages/events/ResponderSyntheticEvent.js b/packages/events/ResponderSyntheticEvent.js index 0dbe0b4d639c..639cdd79430a 100644 --- a/packages/events/ResponderSyntheticEvent.js +++ b/packages/events/ResponderSyntheticEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ResponderSyntheticEvent */ 'use strict'; diff --git a/packages/events/ResponderTouchHistoryStore.js b/packages/events/ResponderTouchHistoryStore.js index 24deabd56828..505fc062516c 100644 --- a/packages/events/ResponderTouchHistoryStore.js +++ b/packages/events/ResponderTouchHistoryStore.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ResponderTouchHistoryStore * @flow */ diff --git a/packages/events/SyntheticEvent.js b/packages/events/SyntheticEvent.js index c984d09ac442..ab9ccf0d4894 100644 --- a/packages/events/SyntheticEvent.js +++ b/packages/events/SyntheticEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticEvent */ /* eslint valid-typeof: 0 */ diff --git a/packages/events/accumulate.js b/packages/events/accumulate.js index ca858d204301..c9d6ff5664e8 100644 --- a/packages/events/accumulate.js +++ b/packages/events/accumulate.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule accumulate * @flow */ diff --git a/packages/events/accumulateInto.js b/packages/events/accumulateInto.js index 291d34f67b44..9dff46aad912 100644 --- a/packages/events/accumulateInto.js +++ b/packages/events/accumulateInto.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule accumulateInto * @flow */ diff --git a/packages/events/forEachAccumulated.js b/packages/events/forEachAccumulated.js index 6ff010cdcca2..39457d97affb 100644 --- a/packages/events/forEachAccumulated.js +++ b/packages/events/forEachAccumulated.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule forEachAccumulated * @flow */ diff --git a/packages/react-art/npm/Circle.js b/packages/react-art/npm/Circle.js index bad709488d7f..4ae42980b189 100644 --- a/packages/react-art/npm/Circle.js +++ b/packages/react-art/npm/Circle.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule Circle.art * @typechecks * * Example usage: diff --git a/packages/react-art/npm/Rectangle.js b/packages/react-art/npm/Rectangle.js index 2284c517122f..8488f6a388a9 100644 --- a/packages/react-art/npm/Rectangle.js +++ b/packages/react-art/npm/Rectangle.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule Rectangle.art * @typechecks * * Example usage: diff --git a/packages/react-art/npm/Wedge.js b/packages/react-art/npm/Wedge.js index bcb671db0b82..9a9fd5137532 100644 --- a/packages/react-art/npm/Wedge.js +++ b/packages/react-art/npm/Wedge.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule Wedge.art * @typechecks * * Example usage: diff --git a/packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js b/packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js index 874fdf325603..2370f7ca25e7 100644 --- a/packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js +++ b/packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeCSFeatureFlags * @flow */ diff --git a/packages/react-cs-renderer/src/ReactNativeCSTypes.js b/packages/react-cs-renderer/src/ReactNativeCSTypes.js index 85c5025dbd41..6976804c17ff 100644 --- a/packages/react-cs-renderer/src/ReactNativeCSTypes.js +++ b/packages/react-cs-renderer/src/ReactNativeCSTypes.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeCSTypes * @flow */ 'use strict'; diff --git a/packages/react-dom/src/client/DOMPropertyOperations.js b/packages/react-dom/src/client/DOMPropertyOperations.js index 43bae6f3e7d8..ff9197423569 100644 --- a/packages/react-dom/src/client/DOMPropertyOperations.js +++ b/packages/react-dom/src/client/DOMPropertyOperations.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule DOMPropertyOperations */ 'use strict'; diff --git a/packages/react-dom/src/client/ReactDOMClientInjection.js b/packages/react-dom/src/client/ReactDOMClientInjection.js index d2a3dfc19367..4e667aa9f196 100644 --- a/packages/react-dom/src/client/ReactDOMClientInjection.js +++ b/packages/react-dom/src/client/ReactDOMClientInjection.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMClientInjection */ 'use strict'; diff --git a/packages/react-dom/src/client/ReactDOMComponentTree.js b/packages/react-dom/src/client/ReactDOMComponentTree.js index 1c531f5e93fe..1e03ab8ba3c9 100644 --- a/packages/react-dom/src/client/ReactDOMComponentTree.js +++ b/packages/react-dom/src/client/ReactDOMComponentTree.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMComponentTree */ 'use strict'; diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js index eed71b7628b8..3d470b7ba35e 100644 --- a/packages/react-dom/src/client/ReactDOMFiberComponent.js +++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDOMFiberComponent * @flow */ diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js index 276f502392ed..e456af07ec6c 100644 --- a/packages/react-dom/src/client/ReactDOMFiberInput.js +++ b/packages/react-dom/src/client/ReactDOMFiberInput.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDOMFiberInput * @flow */ diff --git a/packages/react-dom/src/client/ReactDOMFiberOption.js b/packages/react-dom/src/client/ReactDOMFiberOption.js index b0f31cc1bd69..fb4428617243 100644 --- a/packages/react-dom/src/client/ReactDOMFiberOption.js +++ b/packages/react-dom/src/client/ReactDOMFiberOption.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDOMFiberOption * @flow */ diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js index 9023b8822edd..0772bf7525ad 100644 --- a/packages/react-dom/src/client/ReactDOMFiberSelect.js +++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDOMFiberSelect * @flow */ diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js index 656735a63ad2..25901252e67e 100644 --- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js +++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDOMFiberTextarea * @flow */ diff --git a/packages/react-dom/src/client/ReactDOMSelection.js b/packages/react-dom/src/client/ReactDOMSelection.js index aab2fff2a0af..dd12760edd04 100644 --- a/packages/react-dom/src/client/ReactDOMSelection.js +++ b/packages/react-dom/src/client/ReactDOMSelection.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMSelection */ 'use strict'; diff --git a/packages/react-dom/src/client/ReactInputSelection.js b/packages/react-dom/src/client/ReactInputSelection.js index 41b3adb970d7..c98fc4571ad5 100644 --- a/packages/react-dom/src/client/ReactInputSelection.js +++ b/packages/react-dom/src/client/ReactInputSelection.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactInputSelection */ 'use strict'; diff --git a/packages/react-dom/src/client/getNodeForCharacterOffset.js b/packages/react-dom/src/client/getNodeForCharacterOffset.js index 972ba328c85c..fec92761a8ef 100644 --- a/packages/react-dom/src/client/getNodeForCharacterOffset.js +++ b/packages/react-dom/src/client/getNodeForCharacterOffset.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule getNodeForCharacterOffset */ 'use strict'; diff --git a/packages/react-dom/src/client/getTextContentAccessor.js b/packages/react-dom/src/client/getTextContentAccessor.js index 4a820f488be5..1b23eccc6e8a 100644 --- a/packages/react-dom/src/client/getTextContentAccessor.js +++ b/packages/react-dom/src/client/getTextContentAccessor.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule getTextContentAccessor */ 'use strict'; diff --git a/packages/react-dom/src/client/inputValueTracking.js b/packages/react-dom/src/client/inputValueTracking.js index e5b9789eb449..ca3d4b31c4f8 100644 --- a/packages/react-dom/src/client/inputValueTracking.js +++ b/packages/react-dom/src/client/inputValueTracking.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule inputValueTracking * @flow */ diff --git a/packages/react-dom/src/client/setInnerHTML.js b/packages/react-dom/src/client/setInnerHTML.js index 509eae70fcb5..990b9c9ad689 100644 --- a/packages/react-dom/src/client/setInnerHTML.js +++ b/packages/react-dom/src/client/setInnerHTML.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule setInnerHTML */ 'use strict'; diff --git a/packages/react-dom/src/client/setTextContent.js b/packages/react-dom/src/client/setTextContent.js index 1e821103c773..cb7129c8ef55 100644 --- a/packages/react-dom/src/client/setTextContent.js +++ b/packages/react-dom/src/client/setTextContent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule setTextContent */ 'use strict'; diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js index 3af6a32a8934..0551df13b983 100644 --- a/packages/react-dom/src/client/validateDOMNesting.js +++ b/packages/react-dom/src/client/validateDOMNesting.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule validateDOMNesting */ 'use strict'; diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js index 46485af81046..f38ccdac7f14 100644 --- a/packages/react-dom/src/events/BeforeInputEventPlugin.js +++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule BeforeInputEventPlugin */ 'use strict'; diff --git a/packages/react-dom/src/events/BrowserEventConstants.js b/packages/react-dom/src/events/BrowserEventConstants.js index 052943b7b26c..783a39261193 100644 --- a/packages/react-dom/src/events/BrowserEventConstants.js +++ b/packages/react-dom/src/events/BrowserEventConstants.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule BrowserEventConstants */ 'use strict'; diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js index a639170e1930..0b902a88d61c 100644 --- a/packages/react-dom/src/events/ChangeEventPlugin.js +++ b/packages/react-dom/src/events/ChangeEventPlugin.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ChangeEventPlugin */ 'use strict'; diff --git a/packages/react-dom/src/events/DOMEventPluginOrder.js b/packages/react-dom/src/events/DOMEventPluginOrder.js index dc9ad1335e06..5983a53607f8 100644 --- a/packages/react-dom/src/events/DOMEventPluginOrder.js +++ b/packages/react-dom/src/events/DOMEventPluginOrder.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule DOMEventPluginOrder */ 'use strict'; diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js index 25c7967f3e4c..6599f93c2c64 100644 --- a/packages/react-dom/src/events/EnterLeaveEventPlugin.js +++ b/packages/react-dom/src/events/EnterLeaveEventPlugin.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule EnterLeaveEventPlugin */ 'use strict'; diff --git a/packages/react-dom/src/events/FallbackCompositionState.js b/packages/react-dom/src/events/FallbackCompositionState.js index b05d5633f0ff..1274307256e2 100644 --- a/packages/react-dom/src/events/FallbackCompositionState.js +++ b/packages/react-dom/src/events/FallbackCompositionState.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule FallbackCompositionState */ 'use strict'; diff --git a/packages/react-dom/src/events/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js index 7a7b14de2fa8..69f8c95937dd 100644 --- a/packages/react-dom/src/events/ReactBrowserEventEmitter.js +++ b/packages/react-dom/src/events/ReactBrowserEventEmitter.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactBrowserEventEmitter */ 'use strict'; diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js index a1e600f50854..4bd7d5c7d22d 100644 --- a/packages/react-dom/src/events/ReactDOMEventListener.js +++ b/packages/react-dom/src/events/ReactDOMEventListener.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMEventListener */ 'use strict'; diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js index 254cf229f8b3..7708c13f466f 100644 --- a/packages/react-dom/src/events/SelectEventPlugin.js +++ b/packages/react-dom/src/events/SelectEventPlugin.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SelectEventPlugin */ 'use strict'; diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js index d59814ad1e86..75cc9a93a473 100644 --- a/packages/react-dom/src/events/SimpleEventPlugin.js +++ b/packages/react-dom/src/events/SimpleEventPlugin.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule SimpleEventPlugin * @flow */ diff --git a/packages/react-dom/src/events/SyntheticAnimationEvent.js b/packages/react-dom/src/events/SyntheticAnimationEvent.js index 1c463695df4b..a5874e4d8199 100644 --- a/packages/react-dom/src/events/SyntheticAnimationEvent.js +++ b/packages/react-dom/src/events/SyntheticAnimationEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticAnimationEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticClipboardEvent.js b/packages/react-dom/src/events/SyntheticClipboardEvent.js index b29c4431988a..91f71daaf973 100644 --- a/packages/react-dom/src/events/SyntheticClipboardEvent.js +++ b/packages/react-dom/src/events/SyntheticClipboardEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticClipboardEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticCompositionEvent.js b/packages/react-dom/src/events/SyntheticCompositionEvent.js index b8a218b0d38f..e4db47435b71 100644 --- a/packages/react-dom/src/events/SyntheticCompositionEvent.js +++ b/packages/react-dom/src/events/SyntheticCompositionEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticCompositionEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticDragEvent.js b/packages/react-dom/src/events/SyntheticDragEvent.js index dc200b45fb56..8ba119a75bde 100644 --- a/packages/react-dom/src/events/SyntheticDragEvent.js +++ b/packages/react-dom/src/events/SyntheticDragEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticDragEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticFocusEvent.js b/packages/react-dom/src/events/SyntheticFocusEvent.js index 5ca23658038f..62ad360e4655 100644 --- a/packages/react-dom/src/events/SyntheticFocusEvent.js +++ b/packages/react-dom/src/events/SyntheticFocusEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticFocusEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticInputEvent.js b/packages/react-dom/src/events/SyntheticInputEvent.js index 261583fd9fb6..1c9c3bcc2506 100644 --- a/packages/react-dom/src/events/SyntheticInputEvent.js +++ b/packages/react-dom/src/events/SyntheticInputEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticInputEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticKeyboardEvent.js b/packages/react-dom/src/events/SyntheticKeyboardEvent.js index c803668a7faf..4a187821f134 100644 --- a/packages/react-dom/src/events/SyntheticKeyboardEvent.js +++ b/packages/react-dom/src/events/SyntheticKeyboardEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticKeyboardEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticMouseEvent.js b/packages/react-dom/src/events/SyntheticMouseEvent.js index a9b5219edf92..ffc52b55da96 100644 --- a/packages/react-dom/src/events/SyntheticMouseEvent.js +++ b/packages/react-dom/src/events/SyntheticMouseEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticMouseEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticTouchEvent.js b/packages/react-dom/src/events/SyntheticTouchEvent.js index 477e6dad893a..2fdb43c48919 100644 --- a/packages/react-dom/src/events/SyntheticTouchEvent.js +++ b/packages/react-dom/src/events/SyntheticTouchEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticTouchEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticTransitionEvent.js b/packages/react-dom/src/events/SyntheticTransitionEvent.js index dc76fa5683f2..4355e25ceaef 100644 --- a/packages/react-dom/src/events/SyntheticTransitionEvent.js +++ b/packages/react-dom/src/events/SyntheticTransitionEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticTransitionEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticUIEvent.js b/packages/react-dom/src/events/SyntheticUIEvent.js index b27c5ab2441d..be0df27f20cf 100644 --- a/packages/react-dom/src/events/SyntheticUIEvent.js +++ b/packages/react-dom/src/events/SyntheticUIEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticUIEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/SyntheticWheelEvent.js b/packages/react-dom/src/events/SyntheticWheelEvent.js index 39237eb18883..0eac6cc4c986 100644 --- a/packages/react-dom/src/events/SyntheticWheelEvent.js +++ b/packages/react-dom/src/events/SyntheticWheelEvent.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SyntheticWheelEvent */ 'use strict'; diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js index df517f4351dc..016bfeb07b16 100644 --- a/packages/react-dom/src/events/TapEventPlugin.js +++ b/packages/react-dom/src/events/TapEventPlugin.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule TapEventPlugin * @flow */ diff --git a/packages/react-dom/src/events/getEventCharCode.js b/packages/react-dom/src/events/getEventCharCode.js index 176b32ce1e3e..a06be3c16e84 100644 --- a/packages/react-dom/src/events/getEventCharCode.js +++ b/packages/react-dom/src/events/getEventCharCode.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule getEventCharCode */ 'use strict'; diff --git a/packages/react-dom/src/events/getEventKey.js b/packages/react-dom/src/events/getEventKey.js index f4cad718470a..d7cebc894d04 100644 --- a/packages/react-dom/src/events/getEventKey.js +++ b/packages/react-dom/src/events/getEventKey.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule getEventKey */ 'use strict'; diff --git a/packages/react-dom/src/events/getEventModifierState.js b/packages/react-dom/src/events/getEventModifierState.js index 5cf170b8d845..a3b8073b7ec8 100644 --- a/packages/react-dom/src/events/getEventModifierState.js +++ b/packages/react-dom/src/events/getEventModifierState.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule getEventModifierState */ 'use strict'; diff --git a/packages/react-dom/src/events/getEventTarget.js b/packages/react-dom/src/events/getEventTarget.js index a32a6e3a8d14..c267725129fe 100644 --- a/packages/react-dom/src/events/getEventTarget.js +++ b/packages/react-dom/src/events/getEventTarget.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule getEventTarget */ 'use strict'; diff --git a/packages/react-dom/src/events/getVendorPrefixedEventName.js b/packages/react-dom/src/events/getVendorPrefixedEventName.js index eb666fec500f..225ca5492d74 100644 --- a/packages/react-dom/src/events/getVendorPrefixedEventName.js +++ b/packages/react-dom/src/events/getVendorPrefixedEventName.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule getVendorPrefixedEventName */ 'use strict'; diff --git a/packages/react-dom/src/events/isEventSupported.js b/packages/react-dom/src/events/isEventSupported.js index 8496624e3bb2..e07f151c5bfd 100644 --- a/packages/react-dom/src/events/isEventSupported.js +++ b/packages/react-dom/src/events/isEventSupported.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule isEventSupported */ 'use strict'; diff --git a/packages/react-dom/src/server/DOMMarkupOperations.js b/packages/react-dom/src/server/DOMMarkupOperations.js index b93305ac4b2f..a908aeda9695 100644 --- a/packages/react-dom/src/server/DOMMarkupOperations.js +++ b/packages/react-dom/src/server/DOMMarkupOperations.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule DOMMarkupOperations */ 'use strict'; diff --git a/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js b/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js index acccaf664e61..56155183e168 100644 --- a/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js +++ b/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMNodeStreamRenderer */ 'use strict'; diff --git a/packages/react-dom/src/server/ReactDOMStringRenderer.js b/packages/react-dom/src/server/ReactDOMStringRenderer.js index 21e2318682bf..e32e6a19c699 100644 --- a/packages/react-dom/src/server/ReactDOMStringRenderer.js +++ b/packages/react-dom/src/server/ReactDOMStringRenderer.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMStringRenderer */ 'use strict'; diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js index 705ddfd36a4f..9e62982f84de 100644 --- a/packages/react-dom/src/server/ReactPartialRenderer.js +++ b/packages/react-dom/src/server/ReactPartialRenderer.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactPartialRenderer */ 'use strict'; diff --git a/packages/react-dom/src/shared/CSSProperty.js b/packages/react-dom/src/shared/CSSProperty.js index 19835c261a5e..961b3406ab73 100644 --- a/packages/react-dom/src/shared/CSSProperty.js +++ b/packages/react-dom/src/shared/CSSProperty.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule CSSProperty */ 'use strict'; diff --git a/packages/react-dom/src/shared/CSSPropertyOperations.js b/packages/react-dom/src/shared/CSSPropertyOperations.js index 1603ec045985..87e9f2e3b987 100644 --- a/packages/react-dom/src/shared/CSSPropertyOperations.js +++ b/packages/react-dom/src/shared/CSSPropertyOperations.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule CSSPropertyOperations */ 'use strict'; diff --git a/packages/react-dom/src/shared/DOMNamespaces.js b/packages/react-dom/src/shared/DOMNamespaces.js index d105334ef88a..efb2eff6b974 100644 --- a/packages/react-dom/src/shared/DOMNamespaces.js +++ b/packages/react-dom/src/shared/DOMNamespaces.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule DOMNamespaces */ 'use strict'; diff --git a/packages/react-dom/src/shared/DOMProperty.js b/packages/react-dom/src/shared/DOMProperty.js index efdd149663bf..b61a9c5a852d 100644 --- a/packages/react-dom/src/shared/DOMProperty.js +++ b/packages/react-dom/src/shared/DOMProperty.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule DOMProperty */ 'use strict'; diff --git a/packages/react-dom/src/shared/HTMLDOMPropertyConfig.js b/packages/react-dom/src/shared/HTMLDOMPropertyConfig.js index aace46cd35fe..964c824beafb 100644 --- a/packages/react-dom/src/shared/HTMLDOMPropertyConfig.js +++ b/packages/react-dom/src/shared/HTMLDOMPropertyConfig.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule HTMLDOMPropertyConfig */ 'use strict'; diff --git a/packages/react-dom/src/shared/HTMLNodeType.js b/packages/react-dom/src/shared/HTMLNodeType.js index c8b5efb28e68..e0741cf91c35 100644 --- a/packages/react-dom/src/shared/HTMLNodeType.js +++ b/packages/react-dom/src/shared/HTMLNodeType.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule HTMLNodeType */ 'use strict'; diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js index 1774728d9a9d..7aa478471165 100644 --- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js +++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactControlledValuePropTypes */ 'use strict'; diff --git a/packages/react-dom/src/shared/ReactDOMInjection.js b/packages/react-dom/src/shared/ReactDOMInjection.js index f27f34a0c86d..c0e1987c937c 100644 --- a/packages/react-dom/src/shared/ReactDOMInjection.js +++ b/packages/react-dom/src/shared/ReactDOMInjection.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMInjection */ 'use strict'; diff --git a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js index eeea4b680808..74cc759adc83 100644 --- a/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js +++ b/packages/react-dom/src/shared/ReactDOMInvalidARIAHook.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMInvalidARIAHook */ 'use strict'; diff --git a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js index 27b781719bd3..27c0718591a9 100644 --- a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js +++ b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMNullInputValuePropHook */ 'use strict'; diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js index 81959d2c7801..7f8953abf897 100644 --- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js +++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactDOMUnknownPropertyHook */ 'use strict'; diff --git a/packages/react-dom/src/shared/SVGDOMPropertyConfig.js b/packages/react-dom/src/shared/SVGDOMPropertyConfig.js index 40bf9a030daf..2aa9f0fb5b0f 100644 --- a/packages/react-dom/src/shared/SVGDOMPropertyConfig.js +++ b/packages/react-dom/src/shared/SVGDOMPropertyConfig.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule SVGDOMPropertyConfig */ 'use strict'; diff --git a/packages/react-dom/src/shared/assertValidProps.js b/packages/react-dom/src/shared/assertValidProps.js index bb738f41e497..1d9e2f27d644 100644 --- a/packages/react-dom/src/shared/assertValidProps.js +++ b/packages/react-dom/src/shared/assertValidProps.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule assertValidProps */ 'use strict'; diff --git a/packages/react-dom/src/shared/checkReact.js b/packages/react-dom/src/shared/checkReact.js index 780497a5b759..d6f7280d1c1d 100644 --- a/packages/react-dom/src/shared/checkReact.js +++ b/packages/react-dom/src/shared/checkReact.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule checkReact * @flow */ diff --git a/packages/react-dom/src/shared/createMicrosoftUnsafeLocalFunction.js b/packages/react-dom/src/shared/createMicrosoftUnsafeLocalFunction.js index c27beba9d5b4..2473afdc6eaa 100644 --- a/packages/react-dom/src/shared/createMicrosoftUnsafeLocalFunction.js +++ b/packages/react-dom/src/shared/createMicrosoftUnsafeLocalFunction.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule createMicrosoftUnsafeLocalFunction */ /* globals MSApp */ diff --git a/packages/react-dom/src/shared/dangerousStyleValue.js b/packages/react-dom/src/shared/dangerousStyleValue.js index 65e0b09d7b3a..8d90e1113648 100644 --- a/packages/react-dom/src/shared/dangerousStyleValue.js +++ b/packages/react-dom/src/shared/dangerousStyleValue.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule dangerousStyleValue */ 'use strict'; diff --git a/packages/react-dom/src/shared/escapeTextContentForBrowser.js b/packages/react-dom/src/shared/escapeTextContentForBrowser.js index b077247b4996..c2210d8c5af1 100644 --- a/packages/react-dom/src/shared/escapeTextContentForBrowser.js +++ b/packages/react-dom/src/shared/escapeTextContentForBrowser.js @@ -28,8 +28,6 @@ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @providesModule escapeTextContentForBrowser */ 'use strict'; diff --git a/packages/react-dom/src/shared/isCustomComponent.js b/packages/react-dom/src/shared/isCustomComponent.js index a84071038615..4740144e6dae 100644 --- a/packages/react-dom/src/shared/isCustomComponent.js +++ b/packages/react-dom/src/shared/isCustomComponent.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule isCustomComponent * @flow */ diff --git a/packages/react-dom/src/shared/omittedCloseTags.js b/packages/react-dom/src/shared/omittedCloseTags.js index e54b16fb5b8f..2af43168f4a5 100644 --- a/packages/react-dom/src/shared/omittedCloseTags.js +++ b/packages/react-dom/src/shared/omittedCloseTags.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule omittedCloseTags */ 'use strict'; diff --git a/packages/react-dom/src/shared/possibleStandardNames.js b/packages/react-dom/src/shared/possibleStandardNames.js index 0349d4ce4e0b..3308cb627646 100644 --- a/packages/react-dom/src/shared/possibleStandardNames.js +++ b/packages/react-dom/src/shared/possibleStandardNames.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule possibleStandardNames */ // When adding attributes to the HTML or SVG whitelist, be sure to diff --git a/packages/react-dom/src/shared/quoteAttributeValueForBrowser.js b/packages/react-dom/src/shared/quoteAttributeValueForBrowser.js index c0da9a2c1db3..4e25e1bf19d3 100644 --- a/packages/react-dom/src/shared/quoteAttributeValueForBrowser.js +++ b/packages/react-dom/src/shared/quoteAttributeValueForBrowser.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule quoteAttributeValueForBrowser */ 'use strict'; diff --git a/packages/react-dom/src/shared/validAriaProperties.js b/packages/react-dom/src/shared/validAriaProperties.js index 2d31dc5a9bc0..7c5570d71c43 100644 --- a/packages/react-dom/src/shared/validAriaProperties.js +++ b/packages/react-dom/src/shared/validAriaProperties.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule validAriaProperties */ 'use strict'; diff --git a/packages/react-dom/src/shared/voidElementTags.js b/packages/react-dom/src/shared/voidElementTags.js index 87ff6839d41d..3f4d3558928c 100644 --- a/packages/react-dom/src/shared/voidElementTags.js +++ b/packages/react-dom/src/shared/voidElementTags.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule voidElementTags */ 'use strict'; diff --git a/packages/react-dom/src/shared/warnValidStyle.js b/packages/react-dom/src/shared/warnValidStyle.js index 9f176c7292e6..5914e8a69650 100644 --- a/packages/react-dom/src/shared/warnValidStyle.js +++ b/packages/react-dom/src/shared/warnValidStyle.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule warnValidStyle */ 'use strict'; diff --git a/packages/react-native-renderer/src/NativeMethodsMixin.js b/packages/react-native-renderer/src/NativeMethodsMixin.js index 0a655ea2530e..492f202118fb 100644 --- a/packages/react-native-renderer/src/NativeMethodsMixin.js +++ b/packages/react-native-renderer/src/NativeMethodsMixin.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule NativeMethodsMixin * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/NativeMethodsMixinUtils.js b/packages/react-native-renderer/src/NativeMethodsMixinUtils.js index 50290385b0bf..e70f1cfeeddd 100644 --- a/packages/react-native-renderer/src/NativeMethodsMixinUtils.js +++ b/packages/react-native-renderer/src/NativeMethodsMixinUtils.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule NativeMethodsMixinUtils * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeAttributePayload.js b/packages/react-native-renderer/src/ReactNativeAttributePayload.js index d9ebf4bec047..6579b39cea8a 100644 --- a/packages/react-native-renderer/src/ReactNativeAttributePayload.js +++ b/packages/react-native-renderer/src/ReactNativeAttributePayload.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeAttributePayload * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js index cda487830a8f..65dafcb941de 100644 --- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js +++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeBridgeEventPlugin * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeComponent.js b/packages/react-native-renderer/src/ReactNativeComponent.js index be8bb6a60c69..c85ad3189749 100644 --- a/packages/react-native-renderer/src/ReactNativeComponent.js +++ b/packages/react-native-renderer/src/ReactNativeComponent.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeComponent * @flow * @format */ diff --git a/packages/react-native-renderer/src/ReactNativeComponentTree.js b/packages/react-native-renderer/src/ReactNativeComponentTree.js index a67da6213bc6..95318abbcef2 100644 --- a/packages/react-native-renderer/src/ReactNativeComponentTree.js +++ b/packages/react-native-renderer/src/ReactNativeComponentTree.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactNativeComponentTree */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js index 6aa7ef092e92..f55264b3bdfb 100644 --- a/packages/react-native-renderer/src/ReactNativeEventEmitter.js +++ b/packages/react-native-renderer/src/ReactNativeEventEmitter.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeEventEmitter * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeEventPluginOrder.js b/packages/react-native-renderer/src/ReactNativeEventPluginOrder.js index a94a55f19f4b..4b2a118a2631 100644 --- a/packages/react-native-renderer/src/ReactNativeEventPluginOrder.js +++ b/packages/react-native-renderer/src/ReactNativeEventPluginOrder.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeEventPluginOrder * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js b/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js index 6ae6ba77dc5f..9f3212d9df67 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js +++ b/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeFiberErrorDialog * @flow */ diff --git a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js index 9cea7a68bf2d..6749fc81e1fe 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js +++ b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeFiberHostComponent * @flow */ diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js index 8206a9fa7c4e..17f9926e0e1a 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js +++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeFiberInspector * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js index 2c198b077f91..929a7413c5bb 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeFiberRenderer * @flow */ diff --git a/packages/react-native-renderer/src/ReactNativeGlobalResponderHandler.js b/packages/react-native-renderer/src/ReactNativeGlobalResponderHandler.js index aefccfb0a4b0..986d37d8445f 100644 --- a/packages/react-native-renderer/src/ReactNativeGlobalResponderHandler.js +++ b/packages/react-native-renderer/src/ReactNativeGlobalResponderHandler.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactNativeGlobalResponderHandler */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeInjection.js b/packages/react-native-renderer/src/ReactNativeInjection.js index db306dca2195..7bcddd370c39 100644 --- a/packages/react-native-renderer/src/ReactNativeInjection.js +++ b/packages/react-native-renderer/src/ReactNativeInjection.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeInjection * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativePropRegistry.js b/packages/react-native-renderer/src/ReactNativePropRegistry.js index 80919287293f..78aaef44647d 100644 --- a/packages/react-native-renderer/src/ReactNativePropRegistry.js +++ b/packages/react-native-renderer/src/ReactNativePropRegistry.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativePropRegistry * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeTagHandles.js b/packages/react-native-renderer/src/ReactNativeTagHandles.js index fcfbae4746ed..6ca15ded45f1 100644 --- a/packages/react-native-renderer/src/ReactNativeTagHandles.js +++ b/packages/react-native-renderer/src/ReactNativeTagHandles.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeTagHandles * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeTypes.js b/packages/react-native-renderer/src/ReactNativeTypes.js index 5da6886014ff..59316b637a37 100644 --- a/packages/react-native-renderer/src/ReactNativeTypes.js +++ b/packages/react-native-renderer/src/ReactNativeTypes.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeTypes * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js b/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js index 46bf63037249..1192324002be 100644 --- a/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js +++ b/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeViewConfigRegistry * @flow */ diff --git a/packages/react-native-renderer/src/createReactNativeComponentClass.js b/packages/react-native-renderer/src/createReactNativeComponentClass.js index 430ef606915b..2f970cb8fc6a 100644 --- a/packages/react-native-renderer/src/createReactNativeComponentClass.js +++ b/packages/react-native-renderer/src/createReactNativeComponentClass.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule createReactNativeComponentClass * @flow */ diff --git a/packages/react-native-renderer/src/findNodeHandle.js b/packages/react-native-renderer/src/findNodeHandle.js index f74b078f57d8..da05b03fec8d 100644 --- a/packages/react-native-renderer/src/findNodeHandle.js +++ b/packages/react-native-renderer/src/findNodeHandle.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule findNodeHandle * @flow */ diff --git a/packages/react-native-renderer/src/findNumericNodeHandle.js b/packages/react-native-renderer/src/findNumericNodeHandle.js index 1d49f7f7cb3d..e6bc039da424 100644 --- a/packages/react-native-renderer/src/findNumericNodeHandle.js +++ b/packages/react-native-renderer/src/findNumericNodeHandle.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule findNumericNodeHandle * @flow */ 'use strict'; diff --git a/packages/react-native-renderer/src/takeSnapshot.js b/packages/react-native-renderer/src/takeSnapshot.js index 8df0ea2de97c..3f06f8aa5246 100644 --- a/packages/react-native-renderer/src/takeSnapshot.js +++ b/packages/react-native-renderer/src/takeSnapshot.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule takeSnapshot * @flow */ 'use strict'; diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js index b40731963e76..bf0393fe97e2 100644 --- a/packages/react-noop-renderer/src/ReactNoop.js +++ b/packages/react-noop-renderer/src/ReactNoop.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNoop * @flow */ diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index e48bf7e12058..3428a3b672c2 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactChildFiber * @flow */ diff --git a/packages/react-reconciler/src/ReactCoroutine.js b/packages/react-reconciler/src/ReactCoroutine.js index 73f5b9826d96..943430f0232c 100644 --- a/packages/react-reconciler/src/ReactCoroutine.js +++ b/packages/react-reconciler/src/ReactCoroutine.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactCoroutine * @flow */ diff --git a/packages/react-reconciler/src/ReactDebugCurrentFiber.js b/packages/react-reconciler/src/ReactDebugCurrentFiber.js index 80a8e6f7f37f..bd63febcbd39 100644 --- a/packages/react-reconciler/src/ReactDebugCurrentFiber.js +++ b/packages/react-reconciler/src/ReactDebugCurrentFiber.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDebugCurrentFiber * @flow */ diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js index d88142eaad53..517e72c47172 100644 --- a/packages/react-reconciler/src/ReactDebugFiberPerf.js +++ b/packages/react-reconciler/src/ReactDebugFiberPerf.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDebugFiberPerf * @flow */ diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index 047b90dcfd9b..de8c156244de 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiber * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index dc43cb262b3e..6cdd638c0ea1 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberBeginWork * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js index 6d7b85f9863d..7dbfe0d2f5a7 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.js +++ b/packages/react-reconciler/src/ReactFiberClassComponent.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberClassComponent * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index b1f5d25196a0..195c1c73c7ad 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberCommitWork * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index 80c194ff8449..554c70c6409f 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberCompleteWork * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js index 6c5aa897a594..82f9cedcff5d 100644 --- a/packages/react-reconciler/src/ReactFiberContext.js +++ b/packages/react-reconciler/src/ReactFiberContext.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberContext * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js index 79aa19ea8296..5f603d4fcef0 100644 --- a/packages/react-reconciler/src/ReactFiberDevToolsHook.js +++ b/packages/react-reconciler/src/ReactFiberDevToolsHook.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberDevToolsHook * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberErrorLogger.js b/packages/react-reconciler/src/ReactFiberErrorLogger.js index 527b6e1d5c65..cd929552e91c 100644 --- a/packages/react-reconciler/src/ReactFiberErrorLogger.js +++ b/packages/react-reconciler/src/ReactFiberErrorLogger.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberErrorLogger * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberExpirationTime.js b/packages/react-reconciler/src/ReactFiberExpirationTime.js index d79c795b1a9c..7a4e599f36cb 100644 --- a/packages/react-reconciler/src/ReactFiberExpirationTime.js +++ b/packages/react-reconciler/src/ReactFiberExpirationTime.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberExpirationTime * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberHostContext.js b/packages/react-reconciler/src/ReactFiberHostContext.js index d29ec32896a8..a8a6bec84b10 100644 --- a/packages/react-reconciler/src/ReactFiberHostContext.js +++ b/packages/react-reconciler/src/ReactFiberHostContext.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberHostContext * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js index 2f55f948d2a9..083dcf217178 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberHydrationContext * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberInstrumentation.js b/packages/react-reconciler/src/ReactFiberInstrumentation.js index e29cb61357a9..249daa3e45bb 100644 --- a/packages/react-reconciler/src/ReactFiberInstrumentation.js +++ b/packages/react-reconciler/src/ReactFiberInstrumentation.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberInstrumentation * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js index 590a79ee1007..1f080e680410 100644 --- a/packages/react-reconciler/src/ReactFiberRoot.js +++ b/packages/react-reconciler/src/ReactFiberRoot.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberRoot * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index 9bc83a0d08d1..5e82dd0c39d9 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberScheduler * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberStack.js b/packages/react-reconciler/src/ReactFiberStack.js index c5d5cd8ed397..9cc7bcd9e8ad 100644 --- a/packages/react-reconciler/src/ReactFiberStack.js +++ b/packages/react-reconciler/src/ReactFiberStack.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberStack * @flow */ diff --git a/packages/react-reconciler/src/ReactFiberUpdateQueue.js b/packages/react-reconciler/src/ReactFiberUpdateQueue.js index 79ebac761664..54a17b9e6998 100644 --- a/packages/react-reconciler/src/ReactFiberUpdateQueue.js +++ b/packages/react-reconciler/src/ReactFiberUpdateQueue.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberUpdateQueue * @flow */ diff --git a/packages/react-reconciler/src/ReactPortal.js b/packages/react-reconciler/src/ReactPortal.js index 478b96415911..8939633845b5 100644 --- a/packages/react-reconciler/src/ReactPortal.js +++ b/packages/react-reconciler/src/ReactPortal.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactPortal * @flow */ diff --git a/packages/react-reconciler/src/ReactTypeOfInternalContext.js b/packages/react-reconciler/src/ReactTypeOfInternalContext.js index d58b92c8a32e..c1778eb9e25e 100644 --- a/packages/react-reconciler/src/ReactTypeOfInternalContext.js +++ b/packages/react-reconciler/src/ReactTypeOfInternalContext.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactTypeOfInternalContext * @flow */ diff --git a/packages/react-reconciler/src/ReactTypes.js b/packages/react-reconciler/src/ReactTypes.js index 736d1210e1f5..5953ba948e2b 100644 --- a/packages/react-reconciler/src/ReactTypes.js +++ b/packages/react-reconciler/src/ReactTypes.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactTypes * @flow */ diff --git a/packages/react-rt-renderer/src/ReactNativeRT.js b/packages/react-rt-renderer/src/ReactNativeRT.js index f5afd158c18f..fee344d26dfd 100644 --- a/packages/react-rt-renderer/src/ReactNativeRT.js +++ b/packages/react-rt-renderer/src/ReactNativeRT.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeRTFiberEntry * @flow */ diff --git a/packages/react-rt-renderer/src/ReactNativeRTComponentTree.js b/packages/react-rt-renderer/src/ReactNativeRTComponentTree.js index bd212575e904..c759ece83bb1 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTComponentTree.js +++ b/packages/react-rt-renderer/src/ReactNativeRTComponentTree.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeRTComponentTree * @flow */ diff --git a/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js b/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js index a350dca24833..dca3a02ea428 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js +++ b/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeRTEventEmitter * @flow */ 'use strict'; diff --git a/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js b/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js index a883e87a62f2..05952f8767ff 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js +++ b/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeRTFiberInspector * @flow */ 'use strict'; diff --git a/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js b/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js index d85cac6ca2d5..29e03213ebf1 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js +++ b/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeRTFiberRenderer * @flow */ diff --git a/packages/react-rt-renderer/src/ReactNativeRTTagHandles.js b/packages/react-rt-renderer/src/ReactNativeRTTagHandles.js index 6f09dff04e50..1796320806be 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTTagHandles.js +++ b/packages/react-rt-renderer/src/ReactNativeRTTagHandles.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeRTTagHandles * @flow */ 'use strict'; diff --git a/packages/react-rt-renderer/src/ReactNativeRTTypes.js b/packages/react-rt-renderer/src/ReactNativeRTTypes.js index df7cb8e7d389..fe542e1a24b5 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTTypes.js +++ b/packages/react-rt-renderer/src/ReactNativeRTTypes.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactNativeRTTypes * @flow */ 'use strict'; diff --git a/packages/react/src/ReactBaseClasses.js b/packages/react/src/ReactBaseClasses.js index 35f6443d10bd..50a47759f80b 100644 --- a/packages/react/src/ReactBaseClasses.js +++ b/packages/react/src/ReactBaseClasses.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactBaseClasses */ 'use strict'; diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js index 502db0d5f004..eb8ed3a9236e 100644 --- a/packages/react/src/ReactChildren.js +++ b/packages/react/src/ReactChildren.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactChildren */ 'use strict'; diff --git a/packages/react/src/ReactCurrentOwner.js b/packages/react/src/ReactCurrentOwner.js index 720de0acc480..cd5260febdd3 100644 --- a/packages/react/src/ReactCurrentOwner.js +++ b/packages/react/src/ReactCurrentOwner.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactCurrentOwner * @flow */ diff --git a/packages/react/src/ReactDebugCurrentFrame.js b/packages/react/src/ReactDebugCurrentFrame.js index e92990a41c1e..2caed6274bda 100644 --- a/packages/react/src/ReactDebugCurrentFrame.js +++ b/packages/react/src/ReactDebugCurrentFrame.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDebugCurrentFrame * @flow */ diff --git a/packages/react/src/ReactElement.js b/packages/react/src/ReactElement.js index ea7b4ad081a5..d3b73b9014ff 100644 --- a/packages/react/src/ReactElement.js +++ b/packages/react/src/ReactElement.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactElement */ 'use strict'; diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js index 544ddfea3e71..bc43037ce229 100644 --- a/packages/react/src/ReactElementValidator.js +++ b/packages/react/src/ReactElementValidator.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactElementValidator */ /** diff --git a/packages/react/src/ReactNoopUpdateQueue.js b/packages/react/src/ReactNoopUpdateQueue.js index 5c18b85ea8bc..5b0631dd0861 100644 --- a/packages/react/src/ReactNoopUpdateQueue.js +++ b/packages/react/src/ReactNoopUpdateQueue.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactNoopUpdateQueue */ 'use strict'; diff --git a/packages/react/src/onlyChild.js b/packages/react/src/onlyChild.js index bfa2fb598c5d..6063d4463cce 100644 --- a/packages/react/src/onlyChild.js +++ b/packages/react/src/onlyChild.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule onlyChild */ 'use strict'; diff --git a/packages/shared/ReactDOMFrameScheduling.js b/packages/shared/ReactDOMFrameScheduling.js index a4c9ae0af88d..0d433d1bb432 100644 --- a/packages/shared/ReactDOMFrameScheduling.js +++ b/packages/shared/ReactDOMFrameScheduling.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactDOMFrameScheduling * @flow */ diff --git a/packages/shared/ReactErrorUtils.js b/packages/shared/ReactErrorUtils.js index 35bed7e28863..6b509382f9b5 100644 --- a/packages/shared/ReactErrorUtils.js +++ b/packages/shared/ReactErrorUtils.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactErrorUtils * @flow */ diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index 6291d1054abc..fae5bce66ad2 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFeatureFlags * @flow */ diff --git a/packages/shared/ReactFiberTreeReflection.js b/packages/shared/ReactFiberTreeReflection.js index 73df623d80cb..f30ad2e9ef90 100644 --- a/packages/shared/ReactFiberTreeReflection.js +++ b/packages/shared/ReactFiberTreeReflection.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactFiberTreeReflection * @flow */ diff --git a/packages/shared/ReactGlobalSharedState.js b/packages/shared/ReactGlobalSharedState.js index 3f922adf0921..6aeeb166dca6 100644 --- a/packages/shared/ReactGlobalSharedState.js +++ b/packages/shared/ReactGlobalSharedState.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactGlobalSharedState */ 'use strict'; diff --git a/packages/shared/ReactInstanceMap.js b/packages/shared/ReactInstanceMap.js index b7bf144542b9..5c52920952b4 100644 --- a/packages/shared/ReactInstanceMap.js +++ b/packages/shared/ReactInstanceMap.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactInstanceMap */ 'use strict'; diff --git a/packages/shared/ReactTreeTraversal.js b/packages/shared/ReactTreeTraversal.js index 69acaba3022a..820ba4f14d6e 100644 --- a/packages/shared/ReactTreeTraversal.js +++ b/packages/shared/ReactTreeTraversal.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactTreeTraversal */ 'use strict'; diff --git a/packages/shared/ReactTypeOfSideEffect.js b/packages/shared/ReactTypeOfSideEffect.js index 1ba724223865..fe00adf38953 100644 --- a/packages/shared/ReactTypeOfSideEffect.js +++ b/packages/shared/ReactTypeOfSideEffect.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactTypeOfSideEffect * @flow */ diff --git a/packages/shared/ReactTypeOfWork.js b/packages/shared/ReactTypeOfWork.js index a5a4fdfd0b99..b5c844bae37d 100644 --- a/packages/shared/ReactTypeOfWork.js +++ b/packages/shared/ReactTypeOfWork.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule ReactTypeOfWork * @flow */ diff --git a/packages/shared/ReactVersion.js b/packages/shared/ReactVersion.js index b97367c4f816..0b999eaef2a1 100644 --- a/packages/shared/ReactVersion.js +++ b/packages/shared/ReactVersion.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule ReactVersion */ 'use strict'; diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js index 5a3b00ec29f9..656c6792d269 100644 --- a/packages/shared/getComponentName.js +++ b/packages/shared/getComponentName.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule getComponentName * @flow */ diff --git a/packages/shared/isTextInputElement.js b/packages/shared/isTextInputElement.js index 1c5c3fd7a74b..76b3a6b44457 100644 --- a/packages/shared/isTextInputElement.js +++ b/packages/shared/isTextInputElement.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule isTextInputElement * @flow */ diff --git a/packages/shared/lowPriorityWarning.js b/packages/shared/lowPriorityWarning.js index 93546cc07fb6..524e16b1cab9 100644 --- a/packages/shared/lowPriorityWarning.js +++ b/packages/shared/lowPriorityWarning.js @@ -3,8 +3,6 @@ * * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. - * - * @providesModule lowPriorityWarning */ 'use strict'; diff --git a/packages/shared/reactProdInvariant.js b/packages/shared/reactProdInvariant.js index f47681754598..22e84e7a43bf 100644 --- a/packages/shared/reactProdInvariant.js +++ b/packages/shared/reactProdInvariant.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule reactProdInvariant * @flow */ 'use strict'; diff --git a/packages/shared/validateCallback.js b/packages/shared/validateCallback.js index fe370ce34811..236e77c45d1f 100644 --- a/packages/shared/validateCallback.js +++ b/packages/shared/validateCallback.js @@ -4,7 +4,6 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @providesModule validateCallback * @flow */ From d5eb021a6f82ecc5de7964cb056a8221d4681434 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 19:22:39 +0100 Subject: [PATCH 09/29] Fix remaining Haste imports I missed earlier --- .../react-dom/src/__tests__/EventPluginHub-test.js | 2 +- packages/react-dom/src/__tests__/ReactDOMInput-test.js | 2 +- packages/react-dom/src/client/ReactDOM.js | 4 ++-- .../src/shared/ReactDOMUnknownPropertyHook.js | 2 +- packages/react-rt-renderer/src/ReactNativeRT.js | 2 +- .../__tests__/dev-expression-with-codes-test.js | 10 +++++----- scripts/error-codes/replace-invariant-error-codes.js | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/react-dom/src/__tests__/EventPluginHub-test.js b/packages/react-dom/src/__tests__/EventPluginHub-test.js index 74421573dc31..64664fc0bb2d 100644 --- a/packages/react-dom/src/__tests__/EventPluginHub-test.js +++ b/packages/react-dom/src/__tests__/EventPluginHub-test.js @@ -9,7 +9,7 @@ 'use strict'; -jest.mock('isEventSupported'); +jest.mock('react-dom/src/client/event/isEventSupported'); describe('EventPluginHub', () => { var React; diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js index 0e289c0d80f2..f5465c1ea2e8 100644 --- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js @@ -36,7 +36,7 @@ describe('ReactDOMInput', () => { ReactDOMServer = require('react-dom/server'); ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? - inputValueTracking = require('inputValueTracking'); + inputValueTracking = require('react-dom/src/client/inputValueTracking'); spyOn(console, 'error'); }); diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index d21c8fe701be..a1ec5bf5f0c7 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -61,9 +61,9 @@ var {precacheFiberNode, updateFiberProps} = ReactDOMComponentTree; if (__DEV__) { var SUPPRESS_HYDRATION_WARNING = 'suppressHydrationWarning'; - var lowPriorityWarning = require('lowPriorityWarning'); + var lowPriorityWarning = require('shared/lowPriorityWarning'); var warning = require('fbjs/lib/warning'); - var validateDOMNesting = require('validateDOMNesting'); + var validateDOMNesting = require('./validateDOMNesting'); var {updatedAncestorInfo} = validateDOMNesting; if ( diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js index 7f8953abf897..627b271b3e25 100644 --- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js +++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js @@ -29,7 +29,7 @@ if (__DEV__) { var rARIACamel = new RegExp( '^(aria)[A-Z][' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$', ); - var possibleStandardNames = require('possibleStandardNames'); + var possibleStandardNames = require('./possibleStandardNames'); var validateProperty = function(tagName, name, value) { if (hasOwnProperty.call(warnedProperties, name) && warnedProperties[name]) { diff --git a/packages/react-rt-renderer/src/ReactNativeRT.js b/packages/react-rt-renderer/src/ReactNativeRT.js index fee344d26dfd..90ac36f405f6 100644 --- a/packages/react-rt-renderer/src/ReactNativeRT.js +++ b/packages/react-rt-renderer/src/ReactNativeRT.js @@ -34,7 +34,7 @@ import type {ReactNodeList} from 'ReactTypes'; */ require('InitializeCore'); -require('ReactNativeRTEventEmitter'); +require('./ReactNativeRTEventEmitter'); ReactGenericBatching.injection.injectFiberBatchedUpdates( ReactNativeRTFiberRenderer.batchedUpdates, diff --git a/scripts/error-codes/__tests__/dev-expression-with-codes-test.js b/scripts/error-codes/__tests__/dev-expression-with-codes-test.js index 1053328a6e6b..958e32aa85d6 100644 --- a/scripts/error-codes/__tests__/dev-expression-with-codes-test.js +++ b/scripts/error-codes/__tests__/dev-expression-with-codes-test.js @@ -36,7 +36,7 @@ describe('dev-expression', () => { it("should add `reactProdInvariant` when it finds `require('invariant')`", () => { compare( "var invariant = require('invariant');", - `var _prodInvariant = require('reactProdInvariant'); + `var _prodInvariant = require('shared/reactProdInvariant'); var invariant = require('invariant');` ); @@ -45,7 +45,7 @@ var invariant = require('invariant');` it('should replace simple invariant calls', () => { compare( "invariant(condition, 'Do not override existing functions.');", - "var _prodInvariant = require('reactProdInvariant');\n\n" + + "var _prodInvariant = require('shared/reactProdInvariant');\n\n" + '!condition ? ' + '__DEV__ ? ' + "invariant(false, 'Do not override existing functions.') : " + @@ -64,7 +64,7 @@ var invariant = require('invariant');` `var invariant = require('invariant'); invariant(condition, 'Do not override existing functions.'); invariant(condition, 'Do not override existing functions.');`, - `var _prodInvariant = require('reactProdInvariant'); + `var _prodInvariant = require('shared/reactProdInvariant'); var invariant = require('invariant'); ${expectedInvariantTransformResult} @@ -75,7 +75,7 @@ ${expectedInvariantTransformResult}` it('should support invariant calls with args', () => { compare( "invariant(condition, 'Expected %s target to be an array; got %s', 'foo', 'bar');", - "var _prodInvariant = require('reactProdInvariant');\n\n" + + "var _prodInvariant = require('shared/reactProdInvariant');\n\n" + '!condition ? ' + '__DEV__ ? ' + "invariant(false, 'Expected %s target to be an array; got %s', 'foo', 'bar') : " + @@ -86,7 +86,7 @@ ${expectedInvariantTransformResult}` it('should support invariant calls with a concatenated template string and args', () => { compare( "invariant(condition, 'Expected a component class, ' + 'got %s.' + '%s', 'Foo', 'Bar');", - "var _prodInvariant = require('reactProdInvariant');\n\n" + + "var _prodInvariant = require('shared/reactProdInvariant');\n\n" + '!condition ? ' + '__DEV__ ? ' + "invariant(false, 'Expected a component class, got %s.%s', 'Foo', 'Bar') : " + diff --git a/scripts/error-codes/replace-invariant-error-codes.js b/scripts/error-codes/replace-invariant-error-codes.js index 5ea6fa24aacf..87ca56039ebe 100644 --- a/scripts/error-codes/replace-invariant-error-codes.js +++ b/scripts/error-codes/replace-invariant-error-codes.js @@ -26,7 +26,7 @@ module.exports = function(babel) { path.scope.getProgramParent().push({ id: localState.prodInvariantIdentifier, init: t.callExpression(t.identifier('require'), [ - t.stringLiteral('reactProdInvariant'), + t.stringLiteral('shared/reactProdInvariant'), ]), }); } From 707b36acd978ab2b6037fb7eba9df4405194c0b2 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 20:29:12 +0100 Subject: [PATCH 10/29] Fix up paths to reflect new flat structure --- packages/events/EventPluginHub.js | 2 +- packages/events/EventPluginUtils.js | 2 +- packages/events/EventPropagators.js | 2 +- packages/events/ResponderEventPlugin.js | 8 +++--- packages/events/ResponderSyntheticEvent.js | 2 +- packages/events/ResponderTouchHistoryStore.js | 2 +- .../__tests__/EventPluginRegistry-test.js | 2 +- .../events/__tests__/accumulateInto-test.js | 2 +- packages/events/package.json | 4 +++ .../react-cs-renderer/src/ReactNativeCS.js | 2 +- packages/react-dom/index.fb.js | 6 ++--- .../src/__tests__/EventPluginHub-test.js | 2 +- .../ReactBrowserEventEmitter-test.js | 8 +++--- .../__tests__/ReactDOMEventListener-test.js | 2 +- packages/react-dom/src/client/ReactDOM.js | 16 ++++++------ .../src/client/ReactDOMClientInjection.js | 20 +++++++------- .../src/client/ReactDOMFiberComponent.js | 4 +-- .../src/events/BeforeInputEventPlugin.js | 6 ++--- .../react-dom/src/events/ChangeEventPlugin.js | 20 +++++++------- .../src/events/EnterLeaveEventPlugin.js | 6 ++--- .../src/events/FallbackCompositionState.js | 2 +- .../src/events/ReactBrowserEventEmitter.js | 6 ++--- .../src/events/ReactDOMEventListener.js | 4 +-- .../react-dom/src/events/SelectEventPlugin.js | 12 ++++----- .../react-dom/src/events/SimpleEventPlugin.js | 26 +++++++++---------- .../src/events/SyntheticAnimationEvent.js | 2 +- .../src/events/SyntheticClipboardEvent.js | 2 +- .../src/events/SyntheticCompositionEvent.js | 2 +- .../src/events/SyntheticInputEvent.js | 2 +- .../src/events/SyntheticTransitionEvent.js | 2 +- .../react-dom/src/events/SyntheticUIEvent.js | 2 +- .../react-dom/src/events/TapEventPlugin.js | 6 ++--- .../__tests__/BeforeInputEventPlugin-test.js | 6 ++--- .../__tests__/ChangeEventPlugin-test.js | 2 +- .../__tests__/EnterLeaveEventPlugin-test.js | 2 +- .../FallbackCompositionState-test.js | 2 +- .../__tests__/SelectEventPlugin-test.js | 2 +- .../__tests__/SyntheticClipboardEvent-test.js | 6 ++--- .../events/__tests__/SyntheticEvent-test.js | 6 ++--- .../__tests__/SyntheticKeyboardEvent-test.js | 10 +++---- .../__tests__/SyntheticWheelEvent-test.js | 6 ++--- .../events/__tests__/getEventCharCode-test.js | 2 +- .../src/events/__tests__/getEventKey-test.js | 2 +- .../react-dom/src/events/getEventTarget.js | 2 +- .../src/shared/ReactDOMUnknownPropertyHook.js | 2 +- .../src/test-utils/ReactTestUtils.js | 4 +-- .../ReactDOMUnstableNativeDependencies.js | 6 ++--- .../src/ReactNativeBridgeEventPlugin.js | 4 +-- .../src/ReactNativeEventEmitter.js | 8 +++--- .../src/ReactNativeInjection.js | 6 ++--- .../src/ReactNativeRenderer.js | 6 ++--- .../src/__tests__/ReactNativeEvents-test.js | 2 +- .../react-reconciler/src/ReactChildFiber.js | 7 ++--- .../src/__tests__/ReactCoroutine-test.js | 2 +- .../__tests__/ReactIncrementalPerf-test.js | 4 +-- .../src/__tests__/ReactPersistent-test.js | 2 +- .../react-rt-renderer/src/ReactNativeRT.js | 4 +-- .../src/ReactNativeRTEventEmitter.js | 2 +- .../src/ReactTestRenderer.js | 2 +- packages/react/src/React.js | 14 +++++----- packages/react/src/ReactChildren.js | 4 +-- packages/react/src/onlyChild.js | 2 +- packages/shared/package.json | 2 +- 63 files changed, 155 insertions(+), 162 deletions(-) create mode 100644 packages/events/package.json diff --git a/packages/events/EventPluginHub.js b/packages/events/EventPluginHub.js index 8219c1edf147..4d88672aa256 100644 --- a/packages/events/EventPluginHub.js +++ b/packages/events/EventPluginHub.js @@ -9,7 +9,7 @@ var EventPluginRegistry = require('./EventPluginRegistry'); var EventPluginUtils = require('./EventPluginUtils'); -var ReactErrorUtils = require('../ReactErrorUtils'); +var ReactErrorUtils = require('shared/ReactErrorUtils'); var accumulateInto = require('./accumulateInto'); var forEachAccumulated = require('./forEachAccumulated'); diff --git a/packages/events/EventPluginUtils.js b/packages/events/EventPluginUtils.js index 8a1533fd4dd6..79e07bc6e0c0 100644 --- a/packages/events/EventPluginUtils.js +++ b/packages/events/EventPluginUtils.js @@ -7,7 +7,7 @@ 'use strict'; -var ReactErrorUtils = require('../ReactErrorUtils'); +var ReactErrorUtils = require('shared/ReactErrorUtils'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/events/EventPropagators.js b/packages/events/EventPropagators.js index 03cf9855d2a6..d0d0057f8b06 100644 --- a/packages/events/EventPropagators.js +++ b/packages/events/EventPropagators.js @@ -8,7 +8,7 @@ 'use strict'; var EventPluginHub = require('./EventPluginHub'); -var ReactTreeTraversal = require('../ReactTreeTraversal'); +var ReactTreeTraversal = require('shared/ReactTreeTraversal'); var accumulateInto = require('./accumulateInto'); var forEachAccumulated = require('./forEachAccumulated'); diff --git a/packages/events/ResponderEventPlugin.js b/packages/events/ResponderEventPlugin.js index 2c12878338bc..d9df1c28e4e9 100644 --- a/packages/events/ResponderEventPlugin.js +++ b/packages/events/ResponderEventPlugin.js @@ -7,13 +7,13 @@ 'use strict'; -var EventPluginUtils = require('../EventPluginUtils'); -var EventPropagators = require('../EventPropagators'); -var ReactTreeTraversal = require('../../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 accumulate = require('./accumulate'); var isStartish = EventPluginUtils.isStartish; var isMoveish = EventPluginUtils.isMoveish; diff --git a/packages/events/ResponderSyntheticEvent.js b/packages/events/ResponderSyntheticEvent.js index 639cdd79430a..12a2b79b83d7 100644 --- a/packages/events/ResponderSyntheticEvent.js +++ b/packages/events/ResponderSyntheticEvent.js @@ -7,7 +7,7 @@ 'use strict'; -var SyntheticEvent = require('../SyntheticEvent'); +var SyntheticEvent = require('./SyntheticEvent'); /** * `touchHistory` isn't actually on the native event, but putting it in the diff --git a/packages/events/ResponderTouchHistoryStore.js b/packages/events/ResponderTouchHistoryStore.js index 505fc062516c..fa04c0e598e3 100644 --- a/packages/events/ResponderTouchHistoryStore.js +++ b/packages/events/ResponderTouchHistoryStore.js @@ -9,7 +9,7 @@ 'use strict'; -const EventPluginUtils = require('../EventPluginUtils'); +const EventPluginUtils = require('./EventPluginUtils'); const invariant = require('fbjs/lib/invariant'); diff --git a/packages/events/__tests__/EventPluginRegistry-test.js b/packages/events/__tests__/EventPluginRegistry-test.js index d0907ce810a1..6273e7779901 100644 --- a/packages/events/__tests__/EventPluginRegistry-test.js +++ b/packages/events/__tests__/EventPluginRegistry-test.js @@ -16,7 +16,7 @@ describe('EventPluginRegistry', () => { beforeEach(() => { jest.resetModuleRegistry(); // TODO: can we express this test with only public API? - EventPluginRegistry = require('shared/event/EventPluginRegistry'); + EventPluginRegistry = require('events/EventPluginRegistry'); createPlugin = function(properties) { return Object.assign({extractEvents: function() {}}, properties); diff --git a/packages/events/__tests__/accumulateInto-test.js b/packages/events/__tests__/accumulateInto-test.js index a3b70118b795..44fff5149422 100644 --- a/packages/events/__tests__/accumulateInto-test.js +++ b/packages/events/__tests__/accumulateInto-test.js @@ -13,7 +13,7 @@ var accumulateInto; describe('accumulateInto', () => { beforeEach(() => { - accumulateInto = require('shared/event/accumulateInto'); + accumulateInto = require('events/accumulateInto'); }); it('throws if the second item is null', () => { diff --git a/packages/events/package.json b/packages/events/package.json new file mode 100644 index 000000000000..d366f8074489 --- /dev/null +++ b/packages/events/package.json @@ -0,0 +1,4 @@ +{ + "private": true, + "name": "events" +} diff --git a/packages/react-cs-renderer/src/ReactNativeCS.js b/packages/react-cs-renderer/src/ReactNativeCS.js index d89ebd735ea8..7b7b51251cb1 100644 --- a/packages/react-cs-renderer/src/ReactNativeCS.js +++ b/packages/react-cs-renderer/src/ReactNativeCS.js @@ -9,7 +9,7 @@ 'use strict'; -const ReactGenericBatching = require('shared/event/ReactGenericBatching'); +const ReactGenericBatching = require('events/ReactGenericBatching'); const ReactVersion = require('shared/ReactVersion'); // TODO: direct imports like some-package/src/* are bad. Fix me. diff --git a/packages/react-dom/index.fb.js b/packages/react-dom/index.fb.js index 7e156de9dd7d..0116cf68fa21 100644 --- a/packages/react-dom/index.fb.js +++ b/packages/react-dom/index.fb.js @@ -19,9 +19,9 @@ Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, { ReactDOMComponentTree: require('./src/client/ReactDOMComponentTree'), ReactInstanceMap: require('shared/ReactInstanceMap'), // These are dependencies of TapEventPlugin: - EventPluginUtils: require('shared/event/EventPluginUtils'), - EventPropagators: require('shared/event/EventPropagators'), - SyntheticUIEvent: require('./client/event/SyntheticUIEvent'), + EventPluginUtils: require('events/EventPluginUtils'), + EventPropagators: require('events/EventPropagators'), + SyntheticUIEvent: require('./events/SyntheticUIEvent'), }); module.exports = ReactDOM; diff --git a/packages/react-dom/src/__tests__/EventPluginHub-test.js b/packages/react-dom/src/__tests__/EventPluginHub-test.js index 64664fc0bb2d..bcf8d7f29cc8 100644 --- a/packages/react-dom/src/__tests__/EventPluginHub-test.js +++ b/packages/react-dom/src/__tests__/EventPluginHub-test.js @@ -9,7 +9,7 @@ 'use strict'; -jest.mock('react-dom/src/client/event/isEventSupported'); +jest.mock('react-dom/src/events/isEventSupported'); describe('EventPluginHub', () => { var React; diff --git a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js index 1e04f9afa0e2..ef826dd01bf8 100644 --- a/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js +++ b/packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js @@ -59,14 +59,14 @@ describe('ReactBrowserEventEmitter', () => { LISTENER.mockClear(); EventListener = require('fbjs/lib/EventListener'); // TODO: can we express this test with only public API? - EventPluginHub = require('shared/event/EventPluginHub'); - EventPluginRegistry = require('shared/event/EventPluginRegistry'); + EventPluginHub = require('events/EventPluginHub'); + EventPluginRegistry = require('events/EventPluginRegistry'); React = require('react'); ReactDOM = require('react-dom'); ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - ReactBrowserEventEmitter = require('react-dom/src/client/event/ReactBrowserEventEmitter'); + ReactBrowserEventEmitter = require('react-dom/src/events/ReactBrowserEventEmitter'); ReactTestUtils = require('react-dom/test-utils'); - TapEventPlugin = require('react-dom/src/client/event/plugins/TapEventPlugin'); + TapEventPlugin = require('react-dom/src/events/TapEventPlugin'); var container = document.createElement('div'); diff --git a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js index 1c2d9f793c57..c126799b2fa3 100644 --- a/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMEventListener-test.js @@ -25,7 +25,7 @@ describe('ReactDOMEventListener', () => { ReactDOM = require('react-dom'); // TODO: can we express this test with only public API? ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - ReactDOMEventListener = require('react-dom/src/client/event/ReactDOMEventListener'); + ReactDOMEventListener = require('react-dom/src/events/ReactDOMEventListener'); ReactTestUtils = require('react-dom/test-utils'); handleTopLevel = jest.fn(); diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index a1ec5bf5f0c7..faee5ff9ccf9 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -14,13 +14,13 @@ import type {ReactNodeList} from 'ReactTypes'; require('../shared/checkReact'); var DOMNamespaces = require('../shared/DOMNamespaces'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var ReactBrowserEventEmitter = require('./event/ReactBrowserEventEmitter'); -var ReactControlledComponent = require('shared/event/ReactControlledComponent'); +var ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter'); +var ReactControlledComponent = require('events/ReactControlledComponent'); var ReactFeatureFlags = require('shared/ReactFeatureFlags'); var ReactDOMComponentTree = require('./ReactDOMComponentTree'); var ReactDOMFiberComponent = require('./ReactDOMFiberComponent'); var ReactDOMFrameScheduling = require('shared/ReactDOMFrameScheduling'); -var ReactGenericBatching = require('shared/event/ReactGenericBatching'); +var ReactGenericBatching = require('events/ReactGenericBatching'); var ReactFiberReconciler = require('react-reconciler'); var ReactInputSelection = require('./ReactInputSelection'); var ReactInstanceMap = require('shared/ReactInstanceMap'); @@ -36,7 +36,7 @@ var { var {ROOT_ATTRIBUTE_NAME} = require('../shared/DOMProperty'); // TODO: direct imports like some-package/src/* are bad. Fix me. -var ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); +var ReactPortal = require('react-reconciler/src/ReactPortal'); var {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); var getComponentName = require('shared/getComponentName'); @@ -940,13 +940,13 @@ var ReactDOM = { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: { // For TapEventPlugin which is popular in open source - EventPluginHub: require('shared/event/EventPluginHub'), + EventPluginHub: require('events/EventPluginHub'), // Used by test-utils - EventPluginRegistry: require('shared/event/EventPluginRegistry'), - EventPropagators: require('shared/event/EventPropagators'), + EventPluginRegistry: require('events/EventPluginRegistry'), + EventPropagators: require('events/EventPropagators'), ReactControlledComponent, ReactDOMComponentTree, - ReactDOMEventListener: require('./event/ReactDOMEventListener'), + ReactDOMEventListener: require('../events/ReactDOMEventListener'), }, }; diff --git a/packages/react-dom/src/client/ReactDOMClientInjection.js b/packages/react-dom/src/client/ReactDOMClientInjection.js index 4e667aa9f196..729757efd71e 100644 --- a/packages/react-dom/src/client/ReactDOMClientInjection.js +++ b/packages/react-dom/src/client/ReactDOMClientInjection.js @@ -7,17 +7,17 @@ 'use strict'; -var BeforeInputEventPlugin = require('./event/plugins/BeforeInputEventPlugin'); -var ChangeEventPlugin = require('./event/plugins/ChangeEventPlugin'); -var DOMEventPluginOrder = require('./event/plugins/DOMEventPluginOrder'); -var EnterLeaveEventPlugin = require('./event/plugins/EnterLeaveEventPlugin'); -var EventPluginHub = require('shared/event/EventPluginHub'); -var EventPluginUtils = require('shared/event/EventPluginUtils'); -var ReactBrowserEventEmitter = require('./event/ReactBrowserEventEmitter'); +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('./event/ReactDOMEventListener'); -var SelectEventPlugin = require('./event/plugins/SelectEventPlugin'); -var SimpleEventPlugin = require('./event/plugins/SimpleEventPlugin'); +var ReactDOMEventListener = require('../events/ReactDOMEventListener'); +var SelectEventPlugin = require('../events/SelectEventPlugin'); +var SimpleEventPlugin = require('../events/SimpleEventPlugin'); ReactDOMEventListener.setHandleTopLevel( ReactBrowserEventEmitter.handleTopLevel, diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js index 3d470b7ba35e..9b2c6a2ee649 100644 --- a/packages/react-dom/src/client/ReactDOMFiberComponent.js +++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js @@ -13,8 +13,8 @@ var CSSPropertyOperations = require('../shared/CSSPropertyOperations'); var DOMNamespaces = require('../shared/DOMNamespaces'); var DOMProperty = require('../shared/DOMProperty'); var DOMPropertyOperations = require('./DOMPropertyOperations'); -var EventPluginRegistry = require('shared/event/EventPluginRegistry'); -var ReactBrowserEventEmitter = require('./event/ReactBrowserEventEmitter'); +var EventPluginRegistry = require('events/EventPluginRegistry'); +var ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter'); var ReactDOMFiberInput = require('./ReactDOMFiberInput'); var ReactDOMFiberOption = require('./ReactDOMFiberOption'); var ReactDOMFiberSelect = require('./ReactDOMFiberSelect'); diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js index f38ccdac7f14..5679dddeb280 100644 --- a/packages/react-dom/src/events/BeforeInputEventPlugin.js +++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js @@ -7,11 +7,11 @@ 'use strict'; -var EventPropagators = require('shared/event/EventPropagators'); +var EventPropagators = require('events/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); var FallbackCompositionState = require('./FallbackCompositionState'); -var SyntheticCompositionEvent = require('../SyntheticCompositionEvent'); -var SyntheticInputEvent = require('../SyntheticInputEvent'); +var SyntheticCompositionEvent = require('./SyntheticCompositionEvent'); +var SyntheticInputEvent = require('./SyntheticInputEvent'); import type {TopLevelTypes} from 'BrowserEventConstants'; diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js index 0b902a88d61c..b20c17eee848 100644 --- a/packages/react-dom/src/events/ChangeEventPlugin.js +++ b/packages/react-dom/src/events/ChangeEventPlugin.js @@ -7,17 +7,17 @@ 'use strict'; -var EventPluginHub = require('shared/event/EventPluginHub'); -var EventPropagators = require('shared/event/EventPropagators'); +var EventPluginHub = require('events/EventPluginHub'); +var EventPropagators = require('events/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var ReactControlledComponent = require('shared/event/ReactControlledComponent'); -var ReactDOMComponentTree = require('../../ReactDOMComponentTree'); -var ReactGenericBatching = require('shared/event/ReactGenericBatching'); -var SyntheticEvent = require('shared/event/SyntheticEvent'); - -var inputValueTracking = require('../../inputValueTracking'); -var getEventTarget = require('../getEventTarget'); -var isEventSupported = require('../isEventSupported'); +var ReactControlledComponent = require('events/ReactControlledComponent'); +var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); +var ReactGenericBatching = require('events/ReactGenericBatching'); +var SyntheticEvent = require('events/SyntheticEvent'); + +var inputValueTracking = require('../client/inputValueTracking'); +var getEventTarget = require('./getEventTarget'); +var isEventSupported = require('./isEventSupported'); var isTextInputElement = require('shared/isTextInputElement'); var eventTypes = { diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js index 6599f93c2c64..210591647683 100644 --- a/packages/react-dom/src/events/EnterLeaveEventPlugin.js +++ b/packages/react-dom/src/events/EnterLeaveEventPlugin.js @@ -7,9 +7,9 @@ 'use strict'; -var EventPropagators = require('shared/event/EventPropagators'); -var ReactDOMComponentTree = require('../../ReactDOMComponentTree'); -var SyntheticMouseEvent = require('../SyntheticMouseEvent'); +var EventPropagators = require('events/EventPropagators'); +var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); +var SyntheticMouseEvent = require('./SyntheticMouseEvent'); var eventTypes = { mouseEnter: { diff --git a/packages/react-dom/src/events/FallbackCompositionState.js b/packages/react-dom/src/events/FallbackCompositionState.js index 1274307256e2..26d18557dd57 100644 --- a/packages/react-dom/src/events/FallbackCompositionState.js +++ b/packages/react-dom/src/events/FallbackCompositionState.js @@ -7,7 +7,7 @@ 'use strict'; -var getTextContentAccessor = require('../../getTextContentAccessor'); +var getTextContentAccessor = require('../client/getTextContentAccessor'); /** * This helper object stores information about text content of a target node, diff --git a/packages/react-dom/src/events/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js index 69f8c95937dd..d52784bb2d5c 100644 --- a/packages/react-dom/src/events/ReactBrowserEventEmitter.js +++ b/packages/react-dom/src/events/ReactBrowserEventEmitter.js @@ -7,12 +7,12 @@ 'use strict'; -var EventPluginRegistry = require('shared/event/EventPluginRegistry'); +var EventPluginRegistry = require('events/EventPluginRegistry'); var ReactDOMEventListener = require('./ReactDOMEventListener'); -var ReactEventEmitterMixin = require('shared/event/ReactEventEmitterMixin'); +var ReactEventEmitterMixin = require('events/ReactEventEmitterMixin'); var isEventSupported = require('./isEventSupported'); -var {topLevelTypes} = require('shared/event/BrowserEventConstants'); +var {topLevelTypes} = require('events/BrowserEventConstants'); /** * Summary of `ReactBrowserEventEmitter` event handling: diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js index 4bd7d5c7d22d..2bbf67fad2a6 100644 --- a/packages/react-dom/src/events/ReactDOMEventListener.js +++ b/packages/react-dom/src/events/ReactDOMEventListener.js @@ -8,9 +8,9 @@ 'use strict'; var EventListener = require('fbjs/lib/EventListener'); -var ReactDOMComponentTree = require('../ReactDOMComponentTree'); +var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); -var ReactGenericBatching = require('shared/event/ReactGenericBatching'); +var ReactGenericBatching = require('events/ReactGenericBatching'); var ReactTypeOfWork = require('shared/ReactTypeOfWork'); var getEventTarget = require('./getEventTarget'); diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js index 7708c13f466f..aab6fcc7b435 100644 --- a/packages/react-dom/src/events/SelectEventPlugin.js +++ b/packages/react-dom/src/events/SelectEventPlugin.js @@ -7,13 +7,13 @@ 'use strict'; -var EventPropagators = require('shared/event/EventPropagators'); +var EventPropagators = require('events/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var ReactBrowserEventEmitter = require('../ReactBrowserEventEmitter'); -var ReactDOMComponentTree = require('../../ReactDOMComponentTree'); -var ReactInputSelection = require('../../ReactInputSelection'); -var SyntheticEvent = require('shared/event/SyntheticEvent'); -var {DOCUMENT_NODE} = require('../../../shared/HTMLNodeType'); +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'); diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js index 75cc9a93a473..5ecd538ea189 100644 --- a/packages/react-dom/src/events/SimpleEventPlugin.js +++ b/packages/react-dom/src/events/SimpleEventPlugin.js @@ -9,20 +9,20 @@ 'use strict'; -var EventPropagators = require('shared/event/EventPropagators'); -var SyntheticAnimationEvent = require('../SyntheticAnimationEvent'); -var SyntheticClipboardEvent = require('../SyntheticClipboardEvent'); -var SyntheticEvent = require('shared/event/SyntheticEvent'); -var SyntheticFocusEvent = require('../SyntheticFocusEvent'); -var SyntheticKeyboardEvent = require('../SyntheticKeyboardEvent'); -var SyntheticMouseEvent = require('../SyntheticMouseEvent'); -var SyntheticDragEvent = require('../SyntheticDragEvent'); -var SyntheticTouchEvent = require('../SyntheticTouchEvent'); -var SyntheticTransitionEvent = require('../SyntheticTransitionEvent'); -var SyntheticUIEvent = require('../SyntheticUIEvent'); -var SyntheticWheelEvent = require('../SyntheticWheelEvent'); +var EventPropagators = require('events/EventPropagators'); +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'); +var SyntheticDragEvent = require('./SyntheticDragEvent'); +var SyntheticTouchEvent = require('./SyntheticTouchEvent'); +var SyntheticTransitionEvent = require('./SyntheticTransitionEvent'); +var SyntheticUIEvent = require('./SyntheticUIEvent'); +var SyntheticWheelEvent = require('./SyntheticWheelEvent'); -var getEventCharCode = require('../getEventCharCode'); +var getEventCharCode = require('./getEventCharCode'); if (__DEV__) { var warning = require('fbjs/lib/warning'); diff --git a/packages/react-dom/src/events/SyntheticAnimationEvent.js b/packages/react-dom/src/events/SyntheticAnimationEvent.js index a5874e4d8199..463ed02dffb7 100644 --- a/packages/react-dom/src/events/SyntheticAnimationEvent.js +++ b/packages/react-dom/src/events/SyntheticAnimationEvent.js @@ -7,7 +7,7 @@ 'use strict'; -var SyntheticEvent = require('shared/event/SyntheticEvent'); +var SyntheticEvent = require('events/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticClipboardEvent.js b/packages/react-dom/src/events/SyntheticClipboardEvent.js index 91f71daaf973..d73860b66905 100644 --- a/packages/react-dom/src/events/SyntheticClipboardEvent.js +++ b/packages/react-dom/src/events/SyntheticClipboardEvent.js @@ -7,7 +7,7 @@ 'use strict'; -var SyntheticEvent = require('shared/event/SyntheticEvent'); +var SyntheticEvent = require('events/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticCompositionEvent.js b/packages/react-dom/src/events/SyntheticCompositionEvent.js index e4db47435b71..9e3096c37365 100644 --- a/packages/react-dom/src/events/SyntheticCompositionEvent.js +++ b/packages/react-dom/src/events/SyntheticCompositionEvent.js @@ -7,7 +7,7 @@ 'use strict'; -var SyntheticEvent = require('shared/event/SyntheticEvent'); +var SyntheticEvent = require('events/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticInputEvent.js b/packages/react-dom/src/events/SyntheticInputEvent.js index 1c9c3bcc2506..caa432ce7713 100644 --- a/packages/react-dom/src/events/SyntheticInputEvent.js +++ b/packages/react-dom/src/events/SyntheticInputEvent.js @@ -7,7 +7,7 @@ 'use strict'; -var SyntheticEvent = require('shared/event/SyntheticEvent'); +var SyntheticEvent = require('events/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticTransitionEvent.js b/packages/react-dom/src/events/SyntheticTransitionEvent.js index 4355e25ceaef..1a10a96264c4 100644 --- a/packages/react-dom/src/events/SyntheticTransitionEvent.js +++ b/packages/react-dom/src/events/SyntheticTransitionEvent.js @@ -7,7 +7,7 @@ 'use strict'; -var SyntheticEvent = require('shared/event/SyntheticEvent'); +var SyntheticEvent = require('events/SyntheticEvent'); /** * @interface Event diff --git a/packages/react-dom/src/events/SyntheticUIEvent.js b/packages/react-dom/src/events/SyntheticUIEvent.js index be0df27f20cf..f3935b457c55 100644 --- a/packages/react-dom/src/events/SyntheticUIEvent.js +++ b/packages/react-dom/src/events/SyntheticUIEvent.js @@ -7,7 +7,7 @@ 'use strict'; -var SyntheticEvent = require('shared/event/SyntheticEvent'); +var SyntheticEvent = require('events/SyntheticEvent'); /** * @interface UIEvent diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js index 016bfeb07b16..d3e53624b822 100644 --- a/packages/react-dom/src/events/TapEventPlugin.js +++ b/packages/react-dom/src/events/TapEventPlugin.js @@ -9,9 +9,9 @@ 'use strict'; -var EventPluginUtils = require('shared/event/EventPluginUtils'); -var EventPropagators = require('shared/event/EventPropagators'); -var SyntheticUIEvent = require('../SyntheticUIEvent'); +var EventPluginUtils = require('events/EventPluginUtils'); +var EventPropagators = require('events/EventPropagators'); +var SyntheticUIEvent = require('./SyntheticUIEvent'); var TouchEventUtils = require('fbjs/lib/TouchEventUtils'); var isStartish = EventPluginUtils.isStartish; diff --git a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js index d00f81e800ff..eb48bcd88a05 100644 --- a/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js @@ -50,9 +50,9 @@ describe('BeforeInputEventPlugin', function() { // TODO: can we express this test with only public API? this.ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - this.SyntheticCompositionEvent = require('react-dom/src/client/event/SyntheticCompositionEvent'); - this.SyntheticInputEvent = require('react-dom/src/client/event/SyntheticInputEvent'); - this.BeforeInputEventPlugin = require('react-dom/src/client/event/plugins/BeforeInputEventPlugin'); + this.SyntheticCompositionEvent = require('react-dom/src/events/SyntheticCompositionEvent'); + this.SyntheticInputEvent = require('react-dom/src/events/SyntheticInputEvent'); + this.BeforeInputEventPlugin = require('react-dom/src/events/BeforeInputEventPlugin'); } function extract(node, eventType, optionalData) { diff --git a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js index 9af37c644eb9..684f1a73c01a 100644 --- a/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js @@ -13,7 +13,7 @@ var React = require('react'); var ReactDOM = require('react-dom'); var ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? -var ChangeEventPlugin = require('react-dom/src/client/event/plugins/ChangeEventPlugin'); +var ChangeEventPlugin = require('react-dom/src/events/ChangeEventPlugin'); var inputValueTracking = require('react-dom/src/client/inputValueTracking'); function getTrackedValue(elem) { diff --git a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js index 38121ba48cd8..25048fe1d762 100644 --- a/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js @@ -24,7 +24,7 @@ describe('EnterLeaveEventPlugin', () => { ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - EnterLeaveEventPlugin = require('react-dom/src/client/event/plugins/EnterLeaveEventPlugin'); + EnterLeaveEventPlugin = require('react-dom/src/events/EnterLeaveEventPlugin'); }); it('should set relatedTarget properly in iframe', () => { diff --git a/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js index 0420d73bc1fb..5dc540ef0f83 100644 --- a/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js +++ b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js @@ -16,7 +16,7 @@ describe('FallbackCompositionState', () => { beforeEach(() => { // TODO: can we express this test with only public API? - FallbackCompositionState = require('react-dom/src/client/event/plugins/FallbackCompositionState'); + FallbackCompositionState = require('react-dom/src/events/FallbackCompositionState'); }); function getInput() { diff --git a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js index 2ae0e4e42712..deee5e767025 100644 --- a/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js +++ b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js @@ -31,7 +31,7 @@ describe('SelectEventPlugin', () => { ReactTestUtils = require('react-dom/test-utils'); // TODO: can we express this test with only public API? ReactDOMComponentTree = require('react-dom/src/client/ReactDOMComponentTree'); - SelectEventPlugin = require('react-dom/src/client/event/plugins/SelectEventPlugin'); + SelectEventPlugin = require('react-dom/src/events/SelectEventPlugin'); }); it('should skip extraction if no listeners are present', () => { diff --git a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js index 5acd7acc7ad5..aa2a008db3c6 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js @@ -16,11 +16,9 @@ describe('SyntheticClipboardEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticClipboardEvent = require('react-dom/src/client/event/SyntheticClipboardEvent'); + SyntheticClipboardEvent = require('react-dom/src/events/SyntheticClipboardEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/client/event/getEventTarget')( - nativeEvent, - ); + var target = require('react-dom/src/events/getEventTarget')(nativeEvent); return SyntheticClipboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js index fd1552b5bd11..8d057e9e32fa 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js @@ -19,15 +19,13 @@ describe('SyntheticEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticEvent = require('shared/event/SyntheticEvent'); + SyntheticEvent = require('events/SyntheticEvent'); React = require('react'); ReactDOM = require('react-dom'); ReactTestUtils = require('react-dom/test-utils'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/client/event/getEventTarget')( - nativeEvent, - ); + var target = require('react-dom/src/events/getEventTarget')(nativeEvent); return SyntheticEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js index 2e1f4523bd95..1f48e33e3937 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js @@ -17,15 +17,13 @@ describe('SyntheticKeyboardEvent', () => { beforeEach(() => { // Mock getEventCharCode for proper unit testing - jest.mock('react-dom/src/client/event/getEventCharCode'); - getEventCharCode = require('react-dom/src/client/event/getEventCharCode'); + jest.mock('react-dom/src/events/getEventCharCode'); + getEventCharCode = require('react-dom/src/events/getEventCharCode'); // TODO: can we express this test with only public API? - SyntheticKeyboardEvent = require('react-dom/src/client/event/SyntheticKeyboardEvent'); + SyntheticKeyboardEvent = require('react-dom/src/events/SyntheticKeyboardEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/client/event/getEventTarget')( - nativeEvent, - ); + var target = require('react-dom/src/events/getEventTarget')(nativeEvent); return SyntheticKeyboardEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js index 0c4598cb2386..a60d3965be79 100644 --- a/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js +++ b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js @@ -16,12 +16,10 @@ describe('SyntheticWheelEvent', () => { beforeEach(() => { // TODO: can we express this test with only public API? - SyntheticWheelEvent = require('react-dom/src/client/event/SyntheticWheelEvent'); + SyntheticWheelEvent = require('react-dom/src/events/SyntheticWheelEvent'); createEvent = function(nativeEvent) { - var target = require('react-dom/src/client/event/getEventTarget')( - nativeEvent, - ); + var target = require('react-dom/src/events/getEventTarget')(nativeEvent); return SyntheticWheelEvent.getPooled({}, '', nativeEvent, target); }; }); diff --git a/packages/react-dom/src/events/__tests__/getEventCharCode-test.js b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js index e87ff069a413..d885706f8928 100644 --- a/packages/react-dom/src/events/__tests__/getEventCharCode-test.js +++ b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getEventCharCode = require('react-dom/src/client/event/getEventCharCode'); +var getEventCharCode = require('react-dom/src/events/getEventCharCode'); describe('getEventCharCode', () => { describe('when charCode is present in nativeEvent', () => { diff --git a/packages/react-dom/src/events/__tests__/getEventKey-test.js b/packages/react-dom/src/events/__tests__/getEventKey-test.js index 0223685a436b..12e4a8342ab1 100644 --- a/packages/react-dom/src/events/__tests__/getEventKey-test.js +++ b/packages/react-dom/src/events/__tests__/getEventKey-test.js @@ -10,7 +10,7 @@ 'use strict'; // TODO: can we express this test with only public API? -var getEventKey = require('react-dom/src/client/event/getEventKey'); +var getEventKey = require('react-dom/src/events/getEventKey'); describe('getEventKey', () => { describe('when key is implemented in a browser', () => { diff --git a/packages/react-dom/src/events/getEventTarget.js b/packages/react-dom/src/events/getEventTarget.js index c267725129fe..9792a29df1c6 100644 --- a/packages/react-dom/src/events/getEventTarget.js +++ b/packages/react-dom/src/events/getEventTarget.js @@ -7,7 +7,7 @@ 'use strict'; -var {TEXT_NODE} = require('../../shared/HTMLNodeType'); +var {TEXT_NODE} = require('../shared/HTMLNodeType'); /** * Gets the target node from a native browser event by accounting for diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js index 627b271b3e25..33877cf48e9c 100644 --- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js +++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js @@ -8,7 +8,7 @@ 'use strict'; var DOMProperty = require('./DOMProperty'); -var EventPluginRegistry = require('shared/event/EventPluginRegistry'); +var EventPluginRegistry = require('events/EventPluginRegistry'); var isCustomComponent = require('./isCustomComponent'); if (__DEV__) { diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js index 3667b62732b1..b1b1751bf3e1 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtils.js +++ b/packages/react-dom/src/test-utils/ReactTestUtils.js @@ -7,13 +7,13 @@ 'use strict'; -var BrowserEventConstants = require('shared/event/BrowserEventConstants'); +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('shared/event/SyntheticEvent'); +var SyntheticEvent = require('events/SyntheticEvent'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js b/packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js index 659616bc8313..afe4345d90b8 100644 --- a/packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js +++ b/packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -const EventPluginUtils = require('shared/event/EventPluginUtils'); -const ResponderEventPlugin = require('shared/event/plugins/ResponderEventPlugin'); -const ResponderTouchHistoryStore = require('shared/event/plugins/ResponderTouchHistoryStore'); +const EventPluginUtils = require('events/EventPluginUtils'); +const ResponderEventPlugin = require('events/ResponderEventPlugin'); +const ResponderTouchHistoryStore = require('events/ResponderTouchHistoryStore'); // This is used by react-native-web. const ReactDOMUnstableNativeDependencies = { diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js index 65dafcb941de..d3afb659724b 100644 --- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js +++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js @@ -8,8 +8,8 @@ */ 'use strict'; -const EventPropagators = require('shared/event/EventPropagators'); -const SyntheticEvent = require('shared/event/SyntheticEvent'); +const EventPropagators = require('events/EventPropagators'); +const SyntheticEvent = require('events/SyntheticEvent'); const invariant = require('fbjs/lib/invariant'); const customBubblingEventTypes = {}; diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js index f55264b3bdfb..40fc38165079 100644 --- a/packages/react-native-renderer/src/ReactNativeEventEmitter.js +++ b/packages/react-native-renderer/src/ReactNativeEventEmitter.js @@ -8,12 +8,12 @@ */ 'use strict'; -var EventPluginHub = require('shared/event/EventPluginHub'); -var EventPluginRegistry = require('shared/event/EventPluginRegistry'); -var ReactEventEmitterMixin = require('shared/event/ReactEventEmitterMixin'); +var EventPluginHub = require('events/EventPluginHub'); +var EventPluginRegistry = require('events/EventPluginRegistry'); +var ReactEventEmitterMixin = require('events/ReactEventEmitterMixin'); var ReactNativeComponentTree = require('./ReactNativeComponentTree'); var ReactNativeTagHandles = require('./ReactNativeTagHandles'); -var ReactGenericBatching = require('shared/event/ReactGenericBatching'); +var ReactGenericBatching = require('events/ReactGenericBatching'); if (__DEV__) { var warning = require('fbjs/lib/warning'); diff --git a/packages/react-native-renderer/src/ReactNativeInjection.js b/packages/react-native-renderer/src/ReactNativeInjection.js index 7bcddd370c39..0050826574ce 100644 --- a/packages/react-native-renderer/src/ReactNativeInjection.js +++ b/packages/react-native-renderer/src/ReactNativeInjection.js @@ -17,8 +17,8 @@ // Module provided by RN: require('InitializeCore'); -var EventPluginHub = require('shared/event/EventPluginHub'); -var EventPluginUtils = require('shared/event/EventPluginUtils'); +var EventPluginHub = require('events/EventPluginHub'); +var EventPluginUtils = require('events/EventPluginUtils'); // Module provided by RN: var RCTEventEmitter = require('RCTEventEmitter'); var ReactNativeBridgeEventPlugin = require('./ReactNativeBridgeEventPlugin'); @@ -26,7 +26,7 @@ var ReactNativeComponentTree = require('./ReactNativeComponentTree'); var ReactNativeEventEmitter = require('./ReactNativeEventEmitter'); var ReactNativeEventPluginOrder = require('./ReactNativeEventPluginOrder'); var ReactNativeGlobalResponderHandler = require('./ReactNativeGlobalResponderHandler'); -var ResponderEventPlugin = require('shared/event/plugins/ResponderEventPlugin'); +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 0fab47fe34b0..a2882cb3dde3 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -11,12 +11,12 @@ // TODO: direct imports like some-package/src/* are bad. Fix me. const ReactFiberErrorLogger = require('react-reconciler/src/ReactFiberErrorLogger'); -const ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); +const ReactPortal = require('react-reconciler/src/ReactPortal'); const { injectInternals, } = require('react-reconciler/src/ReactFiberDevToolsHook'); -const ReactGenericBatching = require('shared/event/ReactGenericBatching'); +const ReactGenericBatching = require('events/ReactGenericBatching'); const ReactNativeFiberErrorDialog = require('./ReactNativeFiberErrorDialog'); const ReactNativeComponentTree = require('./ReactNativeComponentTree'); const ReactNativeFiberRenderer = require('./ReactNativeFiberRenderer'); @@ -102,7 +102,7 @@ const ReactNativeRenderer: ReactNativeType = { ReactGlobalSharedState: require('shared/ReactGlobalSharedState'), // Systrace ReactNativeComponentTree: require('./ReactNativeComponentTree'), // InspectorUtils, ScrollResponder ReactNativePropRegistry: require('./ReactNativePropRegistry'), // flattenStyle, Stylesheet - TouchHistoryMath: require('shared/event/plugins/TouchHistoryMath'), // PanResponder + TouchHistoryMath: require('events/TouchHistoryMath'), // PanResponder createReactNativeComponentClass: require('./createReactNativeComponentClass'), // eg RCTText, RCTView, ReactNativeART takeSnapshot: require('./takeSnapshot'), // react-native-implementation }, diff --git a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js index 6a23e5a43c90..4e18e920d376 100644 --- a/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js +++ b/packages/react-native-renderer/src/__tests__/ReactNativeEvents-test.js @@ -70,7 +70,7 @@ beforeEach(() => { React = require('react'); ReactNative = require('react-native-renderer'); ReactNativeBridgeEventPlugin = require('react-native-renderer/src/ReactNativeBridgeEventPlugin'); - ResponderEventPlugin = require('shared/event/plugins/ResponderEventPlugin'); + ResponderEventPlugin = require('events/ResponderEventPlugin'); UIManager = require('UIManager'); createReactNativeComponentClass = require('react-native-renderer/src/createReactNativeComponentClass'); }); diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 3428a3b672c2..6f473fd0197e 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -14,11 +14,8 @@ import type {ReactCoroutine, ReactPortal, ReactYield} from 'ReactTypes'; import type {Fiber} from 'ReactFiber'; import type {ExpirationTime} from 'ReactFiberExpirationTime'; -var { - REACT_COROUTINE_TYPE, - REACT_YIELD_TYPE, -} = require('./isomorphic/ReactCoroutine'); -var {REACT_PORTAL_TYPE} = require('./isomorphic/ReactPortal'); +var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('./ReactCoroutine'); +var {REACT_PORTAL_TYPE} = require('./ReactPortal'); var ReactFiber = require('./ReactFiber'); var ReactTypeOfSideEffect = require('shared/ReactTypeOfSideEffect'); diff --git a/packages/react-reconciler/src/__tests__/ReactCoroutine-test.js b/packages/react-reconciler/src/__tests__/ReactCoroutine-test.js index 2f02d6fa6b45..fde4ded1f072 100644 --- a/packages/react-reconciler/src/__tests__/ReactCoroutine-test.js +++ b/packages/react-reconciler/src/__tests__/ReactCoroutine-test.js @@ -20,7 +20,7 @@ describe('ReactCoroutine', () => { ReactNoop = require('react-noop-renderer'); // TODO: can we express this test with only public API? // TODO: direct imports like some-package/src/* are bad. Fix me. - ReactCoroutine = require('react-reconciler/src/isomorphic/ReactCoroutine'); + ReactCoroutine = require('react-reconciler/src/ReactCoroutine'); }); function div(...children) { diff --git a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js index f7a28614a5bc..ac751b7ed4cd 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js +++ b/packages/react-reconciler/src/__tests__/ReactIncrementalPerf-test.js @@ -116,8 +116,8 @@ describe('ReactDebugFiberPerf', () => { React = require('react'); ReactNoop = require('react-noop-renderer'); // TODO: can we express this test with only public API? - ReactCoroutine = require('react-reconciler/src/isomorphic/ReactCoroutine'); - ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); + ReactCoroutine = require('react-reconciler/src/ReactCoroutine'); + ReactPortal = require('react-reconciler/src/ReactPortal'); PropTypes = require('prop-types'); }); diff --git a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js index a8d8a6eec806..163c0bc9378e 100644 --- a/packages/react-reconciler/src/__tests__/ReactPersistent-test.js +++ b/packages/react-reconciler/src/__tests__/ReactPersistent-test.js @@ -24,7 +24,7 @@ describe('ReactPersistent', () => { React = require('react'); ReactNoop = require('react-noop-renderer'); - ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); + ReactPortal = require('react-reconciler/src/ReactPortal'); }); const DEFAULT_ROOT_ID = 'persistent-test'; diff --git a/packages/react-rt-renderer/src/ReactNativeRT.js b/packages/react-rt-renderer/src/ReactNativeRT.js index 90ac36f405f6..02c3b549c5aa 100644 --- a/packages/react-rt-renderer/src/ReactNativeRT.js +++ b/packages/react-rt-renderer/src/ReactNativeRT.js @@ -12,12 +12,12 @@ // 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'); -const ReactPortal = require('react-reconciler/src/isomorphic/ReactPortal'); +const ReactPortal = require('react-reconciler/src/ReactPortal'); const { injectInternals, } = require('react-reconciler/src/ReactFiberDevToolsHook'); -const ReactGenericBatching = require('shared/event/ReactGenericBatching'); +const ReactGenericBatching = require('events/ReactGenericBatching'); const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); const ReactNativeRTFiberRenderer = require('./ReactNativeRTFiberRenderer'); const ReactNativeRTFiberInspector = require('./ReactNativeRTFiberInspector'); diff --git a/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js b/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js index dca3a02ea428..3947414ee58b 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js +++ b/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js @@ -9,7 +9,7 @@ 'use strict'; var ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); -var ReactGenericBatching = require('shared/event/ReactGenericBatching'); +var ReactGenericBatching = require('events/ReactGenericBatching'); // Module provided by RN: var BatchedBridge = require('BatchedBridge'); diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index e0253ad3f657..67daa55e0db0 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -11,7 +11,7 @@ var ReactFiberReconciler = require('react-reconciler'); var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); -var ReactGenericBatching = require('shared/event/ReactGenericBatching'); +var ReactGenericBatching = require('events/ReactGenericBatching'); var emptyObject = require('fbjs/lib/emptyObject'); var ReactTypeOfWork = require('shared/ReactTypeOfWork'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/react/src/React.js b/packages/react/src/React.js index cc27b29523f3..812e5d9ea9b1 100644 --- a/packages/react/src/React.js +++ b/packages/react/src/React.js @@ -7,19 +7,19 @@ 'use strict'; -var ReactBaseClasses = require('./class/ReactBaseClasses'); -var ReactChildren = require('./children/ReactChildren'); -var ReactElement = require('./element/ReactElement'); +var ReactBaseClasses = require('./ReactBaseClasses'); +var ReactChildren = require('./ReactChildren'); +var ReactElement = require('./ReactElement'); var ReactVersion = require('shared/ReactVersion'); -var onlyChild = require('./children/onlyChild'); +var onlyChild = require('./onlyChild'); var createElement = ReactElement.createElement; var createFactory = ReactElement.createFactory; var cloneElement = ReactElement.cloneElement; if (__DEV__) { - var ReactElementValidator = require('./element/ReactElementValidator'); + var ReactElementValidator = require('./ReactElementValidator'); createElement = ReactElementValidator.createElement; createFactory = ReactElementValidator.createFactory; cloneElement = ReactElementValidator.cloneElement; @@ -47,7 +47,7 @@ var React = { version: ReactVersion, __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: { - ReactCurrentOwner: require('./element/ReactCurrentOwner'), + ReactCurrentOwner: require('./ReactCurrentOwner'), // Used by renderers to avoid bundling object-assign twice in UMD bundles: assign: require('object-assign'), }, @@ -56,7 +56,7 @@ var React = { if (__DEV__) { Object.assign(React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, { // These should not be included in production. - ReactDebugCurrentFrame: require('./element/ReactDebugCurrentFrame'), + ReactDebugCurrentFrame: require('./ReactDebugCurrentFrame'), }); } diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js index eb8ed3a9236e..4b2fd1cba763 100644 --- a/packages/react/src/ReactChildren.js +++ b/packages/react/src/ReactChildren.js @@ -7,14 +7,14 @@ 'use strict'; -var ReactElement = require('../element/ReactElement'); +var ReactElement = require('./ReactElement'); var emptyFunction = require('fbjs/lib/emptyFunction'); var invariant = require('fbjs/lib/invariant'); if (__DEV__) { var warning = require('fbjs/lib/warning'); - var {getStackAddendum} = require('../element/ReactDebugCurrentFrame'); + var {getStackAddendum} = require('./ReactDebugCurrentFrame'); } var ITERATOR_SYMBOL = typeof Symbol === 'function' && Symbol.iterator; diff --git a/packages/react/src/onlyChild.js b/packages/react/src/onlyChild.js index 6063d4463cce..e52a478a8f8d 100644 --- a/packages/react/src/onlyChild.js +++ b/packages/react/src/onlyChild.js @@ -6,7 +6,7 @@ */ 'use strict'; -var ReactElement = require('../element/ReactElement'); +var ReactElement = require('./ReactElement'); var invariant = require('fbjs/lib/invariant'); diff --git a/packages/shared/package.json b/packages/shared/package.json index c564d0797b28..83e7866a27a7 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,4 +1,4 @@ { "private": true, "name": "shared" -} \ No newline at end of file +} From 3a9397225166e2e8432ae69213d53d434b281f08 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 21:19:51 +0100 Subject: [PATCH 11/29] Fix Flow --- packages/events/EventPluginRegistry.js | 8 ++++++-- packages/events/PluginModuleType.js | 4 ++-- packages/events/ReactSyntheticEventType.js | 2 +- packages/react-cs-renderer/src/ReactNativeCS.js | 2 +- .../src/ReactNativeCSFeatureFlags.js | 2 +- packages/react-dom/src/client/ReactDOM.js | 2 +- packages/react-dom/src/events/SimpleEventPlugin.js | 8 ++++---- .../src/NativeMethodsMixin.js | 2 +- .../src/ReactNativeBridgeEventPlugin.js | 2 +- .../src/ReactNativeComponent.js | 2 +- .../src/ReactNativeFiberErrorDialog.js | 2 +- .../src/ReactNativeFiberHostComponent.js | 4 ++-- .../src/ReactNativeFiberInspector.js | 2 +- .../src/ReactNativeFiberRenderer.js | 2 +- .../src/ReactNativeRenderer.js | 4 ++-- .../src/ReactNativeViewConfigRegistry.js | 2 +- .../src/createReactNativeComponentClass.js | 2 +- .../react-native-renderer/src/findNodeHandle.js | 2 +- packages/react-noop-renderer/src/ReactNoop.js | 4 ++-- packages/react-reconciler/src/ReactChildFiber.js | 10 ++++++---- packages/react-reconciler/src/ReactCoroutine.js | 6 +++++- .../react-reconciler/src/ReactDebugCurrentFiber.js | 2 +- .../react-reconciler/src/ReactDebugFiberPerf.js | 2 +- packages/react-reconciler/src/ReactFiber.js | 14 +++++++------- .../react-reconciler/src/ReactFiberBeginWork.js | 12 ++++++------ .../src/ReactFiberClassComponent.js | 4 ++-- .../react-reconciler/src/ReactFiberCommitWork.js | 2 +- .../react-reconciler/src/ReactFiberCompleteWork.js | 12 ++++++------ packages/react-reconciler/src/ReactFiberContext.js | 4 ++-- .../react-reconciler/src/ReactFiberDevToolsHook.js | 4 ++-- .../react-reconciler/src/ReactFiberHostContext.js | 4 ++-- .../src/ReactFiberHydrationContext.js | 2 +- .../react-reconciler/src/ReactFiberReconciler.js | 6 +++--- packages/react-reconciler/src/ReactFiberRoot.js | 4 ++-- .../react-reconciler/src/ReactFiberScheduler.js | 8 ++++---- packages/react-reconciler/src/ReactFiberStack.js | 2 +- .../react-reconciler/src/ReactFiberUpdateQueue.js | 4 ++-- packages/react-reconciler/src/ReactPortal.js | 2 +- packages/react-rt-renderer/src/ReactNativeRT.js | 4 ++-- .../src/ReactNativeRTComponentTree.js | 2 +- .../react-test-renderer/src/ReactTestRenderer.js | 4 ++-- packages/react/src/ReactCurrentOwner.js | 2 +- packages/shared/ReactFiberComponentTreeHook.js | 2 +- packages/shared/ReactFiberTreeReflection.js | 2 +- .../{react-reconciler/src => shared}/ReactTypes.js | 0 packages/shared/getComponentName.js | 2 +- 46 files changed, 95 insertions(+), 85 deletions(-) rename packages/{react-reconciler/src => shared}/ReactTypes.js (100%) diff --git a/packages/events/EventPluginRegistry.js b/packages/events/EventPluginRegistry.js index 4046a71036c4..caddeb122cd1 100644 --- a/packages/events/EventPluginRegistry.js +++ b/packages/events/EventPluginRegistry.js @@ -9,9 +9,13 @@ 'use strict'; -import type {DispatchConfig} from 'ReactSyntheticEventType'; +import type {DispatchConfig} from './ReactSyntheticEventType'; -import type {AnyNativeEvent, PluginName, PluginModule} from 'PluginModuleType'; +import type { + AnyNativeEvent, + PluginName, + PluginModule, +} from './PluginModuleType'; type NamesToPlugins = {[key: PluginName]: PluginModule}; diff --git a/packages/events/PluginModuleType.js b/packages/events/PluginModuleType.js index 6395a3499cbc..d38a8d3923d7 100644 --- a/packages/events/PluginModuleType.js +++ b/packages/events/PluginModuleType.js @@ -9,11 +9,11 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; import type { DispatchConfig, ReactSyntheticEvent, -} from 'ReactSyntheticEventType'; +} from './ReactSyntheticEventType'; export type EventTypes = {[key: string]: DispatchConfig}; diff --git a/packages/events/ReactSyntheticEventType.js b/packages/events/ReactSyntheticEventType.js index 8032d5d59039..2e844e551912 100644 --- a/packages/events/ReactSyntheticEventType.js +++ b/packages/events/ReactSyntheticEventType.js @@ -10,7 +10,7 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; export type DispatchConfig = { dependencies: Array, diff --git a/packages/react-cs-renderer/src/ReactNativeCS.js b/packages/react-cs-renderer/src/ReactNativeCS.js index 7b7b51251cb1..b83a4f25a7f3 100644 --- a/packages/react-cs-renderer/src/ReactNativeCS.js +++ b/packages/react-cs-renderer/src/ReactNativeCS.js @@ -17,7 +17,7 @@ const { injectInternals, } = require('react-reconciler/src/ReactFiberDevToolsHook'); -import type {ReactNativeCSType} from 'ReactNativeCSTypes'; +import type {ReactNativeCSType} from './ReactNativeCSTypes'; const ReactFiberReconciler = require('react-reconciler'); diff --git a/packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js b/packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js index 2370f7ca25e7..cfa1f95e1bd9 100644 --- a/packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js +++ b/packages/react-cs-renderer/src/ReactNativeCSFeatureFlags.js @@ -9,7 +9,7 @@ 'use strict'; -import type {FeatureFlags} from 'ReactFeatureFlags'; +import type {FeatureFlags} from 'shared/ReactFeatureFlags'; var ReactNativeCSFeatureFlags: FeatureFlags = { enableAsyncSubtreeAPI: true, diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index faee5ff9ccf9..28bfb462180a 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -9,7 +9,7 @@ 'use strict'; -import type {ReactNodeList} from 'ReactTypes'; +import type {ReactNodeList} from 'shared/ReactTypes'; require('../shared/checkReact'); var DOMNamespaces = require('../shared/DOMNamespaces'); diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js index 5ecd538ea189..2f871a59670f 100644 --- a/packages/react-dom/src/events/SimpleEventPlugin.js +++ b/packages/react-dom/src/events/SimpleEventPlugin.js @@ -28,13 +28,13 @@ if (__DEV__) { var warning = require('fbjs/lib/warning'); } -import type {TopLevelTypes} from 'BrowserEventConstants'; +import type {TopLevelTypes} from 'events/BrowserEventConstants'; import type { DispatchConfig, ReactSyntheticEvent, -} from 'ReactSyntheticEventType'; -import type {Fiber} from 'ReactFiber'; -import type {EventTypes, PluginModule} from 'PluginModuleType'; +} from 'events/ReactSyntheticEventType'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; +import type {EventTypes, PluginModule} from 'events/PluginModuleType'; /** * Turns diff --git a/packages/react-native-renderer/src/NativeMethodsMixin.js b/packages/react-native-renderer/src/NativeMethodsMixin.js index 492f202118fb..6a189164128c 100644 --- a/packages/react-native-renderer/src/NativeMethodsMixin.js +++ b/packages/react-native-renderer/src/NativeMethodsMixin.js @@ -30,7 +30,7 @@ import type { MeasureOnSuccessCallback, NativeMethodsMixinType, ReactNativeBaseComponentViewConfig, -} from 'ReactNativeTypes'; +} from './ReactNativeTypes'; /** * `NativeMethodsMixin` provides methods to access the underlying native diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js index d3afb659724b..ecf3fe8f62dd 100644 --- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js +++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js @@ -15,7 +15,7 @@ const invariant = require('fbjs/lib/invariant'); const customBubblingEventTypes = {}; const customDirectEventTypes = {}; -import type {ReactNativeBaseComponentViewConfig} from 'ReactNativeTypes'; +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 c85ad3189749..0022073cdda1 100644 --- a/packages/react-native-renderer/src/ReactNativeComponent.js +++ b/packages/react-native-renderer/src/ReactNativeComponent.js @@ -28,7 +28,7 @@ import type { MeasureOnSuccessCallback, NativeMethodsMixinType, ReactNativeBaseComponentViewConfig, -} from 'ReactNativeTypes'; +} from './ReactNativeTypes'; /** * Superclass that provides methods to access the underlying native component. diff --git a/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js b/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js index 9f3212d9df67..76d32b1112fc 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js +++ b/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js @@ -12,7 +12,7 @@ // Module provided by RN: const ExceptionsManager = require('ExceptionsManager'); -import type {CapturedError} from 'ReactFiberScheduler'; +import type {CapturedError} from 'react-reconciler/src/ReactFiberScheduler'; /** * Intercept lifecycle errors and ensure they are shown with the correct stack diff --git a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js index 6749fc81e1fe..9e3a8770b059 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js +++ b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js @@ -26,8 +26,8 @@ import type { MeasureOnSuccessCallback, NativeMethodsMixinType, ReactNativeBaseComponentViewConfig, -} from 'ReactNativeTypes'; -import type {Instance} from 'ReactNativeFiberRenderer'; +} from './ReactNativeTypes'; +import type {Instance} from './ReactNativeFiberRenderer'; /** * This component defines the same methods as NativeMethodsMixin but without the diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js index 17f9926e0e1a..7016f0885978 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js +++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js @@ -22,7 +22,7 @@ const {getClosestInstanceFromNode} = ReactNativeComponentTree; const {findCurrentFiberUsingSlowPath} = ReactFiberTreeReflection; const {HostComponent} = ReactTypeOfWork; -import type {Fiber} from 'ReactFiber'; +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 929a7413c5bb..4e5ed2ef4f26 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js @@ -23,7 +23,7 @@ const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationI const emptyObject = require('fbjs/lib/emptyObject'); const invariant = require('fbjs/lib/invariant'); -import type {ReactNativeBaseComponentViewConfig} from 'ReactNativeTypes'; +import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes'; export type Container = number; export type Instance = { diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index a2882cb3dde3..4c9a0e2b0a28 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -28,8 +28,8 @@ const UIManager = require('UIManager'); const findNumericNodeHandle = require('./findNumericNodeHandle'); -import type {ReactNativeType} from 'ReactNativeTypes'; -import type {ReactNodeList} from 'ReactTypes'; +import type {ReactNativeType} from './ReactNativeTypes'; +import type {ReactNodeList} from 'shared/ReactTypes'; require('./ReactNativeInjection'); diff --git a/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js b/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js index 1192324002be..a86eccfb505b 100644 --- a/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js +++ b/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js @@ -14,7 +14,7 @@ const invariant = require('fbjs/lib/invariant'); import type { ReactNativeBaseComponentViewConfig, ViewConfigGetter, -} from 'ReactNativeTypes'; +} from './ReactNativeTypes'; 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 2f970cb8fc6a..f7118b527585 100644 --- a/packages/react-native-renderer/src/createReactNativeComponentClass.js +++ b/packages/react-native-renderer/src/createReactNativeComponentClass.js @@ -11,7 +11,7 @@ const ReactNativeViewConfigRegistry = require('./ReactNativeViewConfigRegistry'); -import type {ViewConfigGetter} from 'ReactNativeTypes'; +import type {ViewConfigGetter} from './ReactNativeTypes'; /** * Creates a renderable ReactNative host component. diff --git a/packages/react-native-renderer/src/findNodeHandle.js b/packages/react-native-renderer/src/findNodeHandle.js index da05b03fec8d..32b5328f937f 100644 --- a/packages/react-native-renderer/src/findNodeHandle.js +++ b/packages/react-native-renderer/src/findNodeHandle.js @@ -19,7 +19,7 @@ if (__DEV__) { var warning = require('fbjs/lib/warning'); } -import type {Fiber} from 'ReactFiber'; +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 bf0393fe97e2..2c90361135ba 100644 --- a/packages/react-noop-renderer/src/ReactNoop.js +++ b/packages/react-noop-renderer/src/ReactNoop.js @@ -16,8 +16,8 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; -import type {UpdateQueue} from 'ReactFiberUpdateQueue'; +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. diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 6f473fd0197e..602958d553bd 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -9,10 +9,12 @@ 'use strict'; -import type {ReactElement} from 'ReactElementType'; -import type {ReactCoroutine, ReactPortal, ReactYield} from 'ReactTypes'; -import type {Fiber} from 'ReactFiber'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; +import type {ReactElement} from 'shared/ReactElementType'; +import type {ReactCoroutine, ReactPortal, ReactYield} from 'shared/ReactTypes'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; +import type { + ExpirationTime, +} from 'react-reconciler/src/ReactFiberExpirationTime'; var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('./ReactCoroutine'); var {REACT_PORTAL_TYPE} = require('./ReactPortal'); diff --git a/packages/react-reconciler/src/ReactCoroutine.js b/packages/react-reconciler/src/ReactCoroutine.js index 943430f0232c..749fe94b421c 100644 --- a/packages/react-reconciler/src/ReactCoroutine.js +++ b/packages/react-reconciler/src/ReactCoroutine.js @@ -9,7 +9,11 @@ 'use strict'; -import type {ReactCoroutine, ReactNodeList, ReactYield} from 'ReactTypes'; +import type { + ReactCoroutine, + ReactNodeList, + ReactYield, +} from 'shared/ReactTypes'; // The Symbol used to tag the special React types. If there is no native Symbol // nor polyfill, then a plain number is used for performance. diff --git a/packages/react-reconciler/src/ReactDebugCurrentFiber.js b/packages/react-reconciler/src/ReactDebugCurrentFiber.js index bd63febcbd39..d27b203466fc 100644 --- a/packages/react-reconciler/src/ReactDebugCurrentFiber.js +++ b/packages/react-reconciler/src/ReactDebugCurrentFiber.js @@ -9,7 +9,7 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from './ReactFiber'; type LifeCyclePhase = 'render' | 'getChildContext'; diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js index 517e72c47172..e84a67d3d0e5 100644 --- a/packages/react-reconciler/src/ReactDebugFiberPerf.js +++ b/packages/react-reconciler/src/ReactDebugFiberPerf.js @@ -7,7 +7,7 @@ * @flow */ -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from './ReactFiber'; type MeasurementPhase = | 'componentWillMount' diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index de8c156244de..58a81749c57d 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -9,18 +9,18 @@ 'use strict'; -import type {ReactElement, Source} from 'ReactElementType'; +import type {ReactElement, Source} from 'shared/ReactElementType'; import type { ReactCoroutine, ReactFragment, ReactPortal, ReactYield, -} from 'ReactTypes'; -import type {TypeOfWork} from 'ReactTypeOfWork'; -import type {TypeOfInternalContext} from 'ReactTypeOfInternalContext'; -import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; -import type {UpdateQueue} from 'ReactFiberUpdateQueue'; +} from 'shared/ReactTypes'; +import type {TypeOfWork} from 'shared/ReactTypeOfWork'; +import type {TypeOfInternalContext} from './ReactTypeOfInternalContext'; +import type {TypeOfSideEffect} from 'shared/ReactTypeOfSideEffect'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {UpdateQueue} from './ReactFiberUpdateQueue'; var { IndeterminateComponent, diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 6cdd638c0ea1..6cee50814c4d 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -10,12 +10,12 @@ 'use strict'; import type {HostConfig} from 'react-reconciler'; -import type {ReactCoroutine} from 'ReactTypes'; -import type {Fiber} from 'ReactFiber'; -import type {HostContext} from 'ReactFiberHostContext'; -import type {HydrationContext} from 'ReactFiberHydrationContext'; -import type {FiberRoot} from 'ReactFiberRoot'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; +import type {ReactCoroutine} from 'shared/ReactTypes'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; +import type {HostContext} from './ReactFiberHostContext'; +import type {HydrationContext} from './ReactFiberHydrationContext'; +import type {FiberRoot} from './ReactFiberRoot'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; var { mountChildFibersInPlace, diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js index 7dbfe0d2f5a7..ff2091dfb844 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.js +++ b/packages/react-reconciler/src/ReactFiberClassComponent.js @@ -9,8 +9,8 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; +import type {Fiber} from './ReactFiber'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; var {Update} = require('shared/ReactTypeOfSideEffect'); diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index 195c1c73c7ad..91b3c7a239bb 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -10,7 +10,7 @@ 'use strict'; import type {HostConfig} from 'react-reconciler'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from './ReactFiber'; var ReactFeatureFlags = require('shared/ReactFeatureFlags'); var ReactTypeOfWork = require('shared/ReactTypeOfWork'); diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index 554c70c6409f..d94db5869f9c 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -10,12 +10,12 @@ 'use strict'; import type {HostConfig} from 'react-reconciler'; -import type {ReactCoroutine} from 'ReactTypes'; -import type {Fiber} from 'ReactFiber'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; -import type {HostContext} from 'ReactFiberHostContext'; -import type {HydrationContext} from 'ReactFiberHydrationContext'; -import type {FiberRoot} from 'ReactFiberRoot'; +import type {ReactCoroutine} from 'shared/ReactTypes'; +import type {Fiber} from './ReactFiber'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; +import type {HostContext} from './ReactFiberHostContext'; +import type {HydrationContext} from './ReactFiberHydrationContext'; +import type {FiberRoot} from './ReactFiberRoot'; var {reconcileChildFibers} = require('./ReactChildFiber'); var { diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js index 82f9cedcff5d..4f89ccee8545 100644 --- a/packages/react-reconciler/src/ReactFiberContext.js +++ b/packages/react-reconciler/src/ReactFiberContext.js @@ -9,8 +9,8 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; -import type {StackCursor} from 'ReactFiberStack'; +import type {Fiber} from './ReactFiber'; +import type {StackCursor} from './ReactFiberStack'; var emptyObject = require('fbjs/lib/emptyObject'); var getComponentName = require('shared/getComponentName'); diff --git a/packages/react-reconciler/src/ReactFiberDevToolsHook.js b/packages/react-reconciler/src/ReactFiberDevToolsHook.js index 5f603d4fcef0..eebd2031c6b3 100644 --- a/packages/react-reconciler/src/ReactFiberDevToolsHook.js +++ b/packages/react-reconciler/src/ReactFiberDevToolsHook.js @@ -9,8 +9,8 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; -import type {FiberRoot} from 'ReactFiberRoot'; +import type {Fiber} from './ReactFiber'; +import type {FiberRoot} from './ReactFiberRoot'; declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: Object | void; diff --git a/packages/react-reconciler/src/ReactFiberHostContext.js b/packages/react-reconciler/src/ReactFiberHostContext.js index a8a6bec84b10..b6858198d965 100644 --- a/packages/react-reconciler/src/ReactFiberHostContext.js +++ b/packages/react-reconciler/src/ReactFiberHostContext.js @@ -10,8 +10,8 @@ 'use strict'; import type {HostConfig} from 'react-reconciler'; -import type {Fiber} from 'ReactFiber'; -import type {StackCursor} from 'ReactFiberStack'; +import type {Fiber} from './ReactFiber'; +import type {StackCursor} from './ReactFiberStack'; const {createCursor, pop, push} = require('./ReactFiberStack'); diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js index 083dcf217178..f37fe514eef6 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js @@ -10,7 +10,7 @@ 'use strict'; import type {HostConfig} from 'react-reconciler'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from './ReactFiber'; var invariant = require('fbjs/lib/invariant'); diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index 61ae1fee9696..43ed72878b8a 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -9,9 +9,9 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; -import type {FiberRoot} from 'ReactFiberRoot'; -import type {ReactNodeList} from 'ReactTypes'; +import type {Fiber} from './ReactFiber'; +import type {FiberRoot} from './ReactFiberRoot'; +import type {ReactNodeList} from 'shared/ReactTypes'; var ReactFeatureFlags = require('shared/ReactFeatureFlags'); var { diff --git a/packages/react-reconciler/src/ReactFiberRoot.js b/packages/react-reconciler/src/ReactFiberRoot.js index 1f080e680410..a8fa67e49b92 100644 --- a/packages/react-reconciler/src/ReactFiberRoot.js +++ b/packages/react-reconciler/src/ReactFiberRoot.js @@ -9,8 +9,8 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; +import type {Fiber} from './ReactFiber'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; const {createHostRootFiber} = require('./ReactFiber'); const {NoWork} = require('./ReactFiberExpirationTime'); diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index 5e82dd0c39d9..6b0b9c577e96 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -10,10 +10,10 @@ 'use strict'; import type {HostConfig, Deadline} from 'react-reconciler'; -import type {Fiber} from 'ReactFiber'; -import type {FiberRoot} from 'ReactFiberRoot'; -import type {HydrationContext} from 'ReactFiberHydrationContext'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; +import type {Fiber} from './ReactFiber'; +import type {FiberRoot} from './ReactFiberRoot'; +import type {HydrationContext} from './ReactFiberHydrationContext'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; export type CapturedError = { componentName: ?string, diff --git a/packages/react-reconciler/src/ReactFiberStack.js b/packages/react-reconciler/src/ReactFiberStack.js index 9cc7bcd9e8ad..d77a2254aab6 100644 --- a/packages/react-reconciler/src/ReactFiberStack.js +++ b/packages/react-reconciler/src/ReactFiberStack.js @@ -9,7 +9,7 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from './ReactFiber'; export type StackCursor = { current: T, diff --git a/packages/react-reconciler/src/ReactFiberUpdateQueue.js b/packages/react-reconciler/src/ReactFiberUpdateQueue.js index 54a17b9e6998..634f09727e1f 100644 --- a/packages/react-reconciler/src/ReactFiberUpdateQueue.js +++ b/packages/react-reconciler/src/ReactFiberUpdateQueue.js @@ -9,8 +9,8 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; -import type {ExpirationTime} from 'ReactFiberExpirationTime'; +import type {Fiber} from './ReactFiber'; +import type {ExpirationTime} from './ReactFiberExpirationTime'; const {Callback: CallbackEffect} = require('shared/ReactTypeOfSideEffect'); diff --git a/packages/react-reconciler/src/ReactPortal.js b/packages/react-reconciler/src/ReactPortal.js index 8939633845b5..08dfb66ab04c 100644 --- a/packages/react-reconciler/src/ReactPortal.js +++ b/packages/react-reconciler/src/ReactPortal.js @@ -9,7 +9,7 @@ 'use strict'; -import type {ReactNodeList, ReactPortal} from 'ReactTypes'; +import type {ReactNodeList, ReactPortal} from 'shared/ReactTypes'; // The Symbol used to tag the special React types. If there is no native Symbol // nor polyfill, then a plain number is used for performance. diff --git a/packages/react-rt-renderer/src/ReactNativeRT.js b/packages/react-rt-renderer/src/ReactNativeRT.js index 02c3b549c5aa..7d1fc677294c 100644 --- a/packages/react-rt-renderer/src/ReactNativeRT.js +++ b/packages/react-rt-renderer/src/ReactNativeRT.js @@ -23,8 +23,8 @@ const ReactNativeRTFiberRenderer = require('./ReactNativeRTFiberRenderer'); const ReactNativeRTFiberInspector = require('./ReactNativeRTFiberInspector'); const ReactVersion = require('shared/ReactVersion'); -import type {ReactNativeRTType} from 'ReactNativeRTTypes'; -import type {ReactNodeList} from 'ReactTypes'; +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/ReactNativeRTComponentTree.js b/packages/react-rt-renderer/src/ReactNativeRTComponentTree.js index c759ece83bb1..d6b2334f9431 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTComponentTree.js +++ b/packages/react-rt-renderer/src/ReactNativeRTComponentTree.js @@ -9,7 +9,7 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; var instanceCache: {[key: number]: Fiber} = {}; var instanceProps: {[key: number]: Object} = {}; diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index 67daa55e0db0..88f898c84f30 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -24,8 +24,8 @@ var { HostRoot, } = ReactTypeOfWork; -import type {Fiber} from 'ReactFiber'; -import type {FiberRoot} from 'ReactFiberRoot'; +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/ReactCurrentOwner.js b/packages/react/src/ReactCurrentOwner.js index cd5260febdd3..c0eb29541ea2 100644 --- a/packages/react/src/ReactCurrentOwner.js +++ b/packages/react/src/ReactCurrentOwner.js @@ -9,7 +9,7 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; /** * Keeps track of the current owner. diff --git a/packages/shared/ReactFiberComponentTreeHook.js b/packages/shared/ReactFiberComponentTreeHook.js index 9a705e76f012..f32da7e672af 100644 --- a/packages/shared/ReactFiberComponentTreeHook.js +++ b/packages/shared/ReactFiberComponentTreeHook.js @@ -20,7 +20,7 @@ var { var describeComponentFrame = require('./describeComponentFrame'); var getComponentName = require('./getComponentName'); -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; function describeFiber(fiber: Fiber): string { switch (fiber.tag) { diff --git a/packages/shared/ReactFiberTreeReflection.js b/packages/shared/ReactFiberTreeReflection.js index f30ad2e9ef90..15ba7c3fb69f 100644 --- a/packages/shared/ReactFiberTreeReflection.js +++ b/packages/shared/ReactFiberTreeReflection.js @@ -9,7 +9,7 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; var ReactInstanceMap = require('./ReactInstanceMap'); var {ReactCurrentOwner} = require('./ReactGlobalSharedState'); diff --git a/packages/react-reconciler/src/ReactTypes.js b/packages/shared/ReactTypes.js similarity index 100% rename from packages/react-reconciler/src/ReactTypes.js rename to packages/shared/ReactTypes.js diff --git a/packages/shared/getComponentName.js b/packages/shared/getComponentName.js index 656c6792d269..d7ebb930018a 100644 --- a/packages/shared/getComponentName.js +++ b/packages/shared/getComponentName.js @@ -9,7 +9,7 @@ 'use strict'; -import type {Fiber} from 'ReactFiber'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; function getComponentName(fiber: Fiber): string | null { const {type} = fiber; From 905f2538e28a61b4b18ca53f066db5328b1cd186 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Sat, 21 Oct 2017 00:23:47 +0100 Subject: [PATCH 12/29] Fix CJS and UMD builds --- package.json | 2 +- packages/events/package.json | 3 +- packages/react-art/package.json | 1 + .../src/events/ReactBrowserEventEmitter.js | 2 +- .../src/test-utils/ReactTestUtils.js | 2 +- packages/shared/package.json | 3 +- scripts/print-warnings/print-warnings.js | 5 +- scripts/rollup/build.js | 207 +++++------ scripts/rollup/bundles.js | 347 +++--------------- scripts/rollup/mangle.js | 12 - scripts/rollup/modules.js | 344 ++--------------- scripts/rollup/packaging.js | 20 +- scripts/rollup/results.json | 8 +- yarn.lock | 2 +- 14 files changed, 217 insertions(+), 741 deletions(-) delete mode 100644 scripts/rollup/mangle.js diff --git a/package.json b/package.json index 6e7318e4f746..6de436502e9a 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "rollup-plugin-closure-compiler-js": "^1.0.4", "rollup-plugin-commonjs": "^8.0.2", "rollup-plugin-inject": "^2.0.0", - "rollup-plugin-node-resolve": "^2.0.0", + "rollup-plugin-node-resolve": "^2", "rollup-plugin-replace": "^1.1.1", "rollup-plugin-uglify": "^1.0.1", "run-sequence": "^1.1.4", diff --git a/packages/events/package.json b/packages/events/package.json index d366f8074489..66aeb1136397 100644 --- a/packages/events/package.json +++ b/packages/events/package.json @@ -1,4 +1,5 @@ { "private": true, - "name": "events" + "name": "events", + "version": "0.0.0" } diff --git a/packages/react-art/package.json b/packages/react-art/package.json index 94c7f9a8b19a..49bf9d82553a 100644 --- a/packages/react-art/package.json +++ b/packages/react-art/package.json @@ -26,6 +26,7 @@ "prop-types": "^15.6.0" }, "peerDependencies": { + "art": "^0.10.1", "react": "^16.0.0" }, "files": [ diff --git a/packages/react-dom/src/events/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js index d52784bb2d5c..7b0f57936119 100644 --- a/packages/react-dom/src/events/ReactBrowserEventEmitter.js +++ b/packages/react-dom/src/events/ReactBrowserEventEmitter.js @@ -12,7 +12,7 @@ var ReactDOMEventListener = require('./ReactDOMEventListener'); var ReactEventEmitterMixin = require('events/ReactEventEmitterMixin'); var isEventSupported = require('./isEventSupported'); -var {topLevelTypes} = require('events/BrowserEventConstants'); +var {topLevelTypes} = require('./BrowserEventConstants'); /** * Summary of `ReactBrowserEventEmitter` event handling: diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js index b1b1751bf3e1..eab0c9fbe1d5 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtils.js +++ b/packages/react-dom/src/test-utils/ReactTestUtils.js @@ -7,7 +7,7 @@ 'use strict'; -var BrowserEventConstants = require('events/BrowserEventConstants'); +var BrowserEventConstants = require('../events/BrowserEventConstants'); var React = require('react'); var ReactDOM = require('react-dom'); var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); diff --git a/packages/shared/package.json b/packages/shared/package.json index 83e7866a27a7..3398f229c586 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,4 +1,5 @@ { "private": true, - "name": "shared" + "name": "shared", + "version": "0.0.0" } diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js index 9612b924a823..4e9999396073 100644 --- a/scripts/print-warnings/print-warnings.js +++ b/scripts/print-warnings/print-warnings.js @@ -70,8 +70,9 @@ const sourcePaths = Bundles.bundles bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_DEV) !== -1 || bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_PROD) !== -1 ) - .reduce((allPaths, bundle) => allPaths.concat(bundle.paths), []) - .concat(Modules.getExcludedHasteGlobs().map(glob => `!${glob}`)); + .reduce((allPaths, bundle) => allPaths.concat(bundle.paths), []); + // TODO: this is broken. + // .concat(Modules.getExcludedHasteGlobs().map(glob => `!${glob}`)); gs(sourcePaths).pipe( through.obj(transform, cb => { diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index c3df0a054d10..1c0b53072185 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -10,12 +10,12 @@ const chalk = require('chalk'); const escapeStringRegexp = require('escape-string-regexp'); const join = require('path').join; const resolve = require('path').resolve; +const resolvePlugin = require('rollup-plugin-node-resolve'); const fs = require('fs'); const rimraf = require('rimraf'); const argv = require('minimist')(process.argv.slice(2)); const Modules = require('./modules'); const Bundles = require('./bundles'); -const propertyMangleWhitelist = require('./mangle').propertyMangleWhitelist; const sizes = require('./plugins/sizes-plugin'); const Stats = require('./stats'); const syncReactDom = require('./sync').syncReactDom; @@ -47,21 +47,13 @@ const requestedBundleNames = (argv._[0] || '') const syncFbsource = argv['sync-fbsource']; const syncWww = argv['sync-www']; -// used for when we property mangle with uglify/gcc -const mangleRegex = new RegExp( - `^(?${propertyMangleWhitelist - .map(prop => `!${escapeStringRegexp(prop)}`) - .join('|')}$).*$`, - 'g' -); - -function getHeaderSanityCheck(bundleType, hasteName) { +function getHeaderSanityCheck(bundleType, globalName) { switch (bundleType) { case FB_DEV: case FB_PROD: case RN_DEV: case RN_PROD: - let hasteFinalName = hasteName; + let hasteFinalName = globalName; switch (bundleType) { case FB_DEV: case RN_DEV: @@ -81,7 +73,7 @@ function getHeaderSanityCheck(bundleType, hasteName) { } } -function getBanner(bundleType, hasteName, filename, moduleType) { +function getBanner(bundleType, globalName, filename, moduleType) { if (moduleType === RECONCILER) { // Standalone reconciler is only used by third-party renderers. // It is handled separately. @@ -109,7 +101,7 @@ function getBanner(bundleType, hasteName, filename, moduleType) { case RN_DEV: case RN_PROD: const isDev = bundleType === FB_DEV || bundleType === RN_DEV; - const hasteFinalName = hasteName + (isDev ? '-dev' : '-prod'); + const hasteFinalName = globalName + (isDev ? '-dev' : '-prod'); // Wrap the contents of the if-DEV check with an IIFE. // Block-level function definitions can cause problems for strict mode. return ( @@ -179,14 +171,22 @@ function getReconcilerFooter(bundleType) { } } -function updateBabelConfig(babelOpts, bundleType, filename) { +function getBabelConfig(updateBabelOptions, bundleType, filename) { + let options = { + exclude: 'node_modules/**', + presets: [], + plugins: [], + }; + if (updateBabelOptions) { + options = updateBabelOptions(options); + } switch (bundleType) { case FB_DEV: case FB_PROD: case RN_DEV: case RN_PROD: - return Object.assign({}, babelOpts, { - plugins: babelOpts.plugins.concat([ + return Object.assign({}, options, { + plugins: options.plugins.concat([ // Wrap warning() calls in a __DEV__ check so they are stripped from production. require('./plugins/wrap-warning-with-env-check'), ]), @@ -195,8 +195,8 @@ function updateBabelConfig(babelOpts, bundleType, filename) { case UMD_PROD: case NODE_DEV: case NODE_PROD: - return Object.assign({}, babelOpts, { - plugins: babelOpts.plugins.concat([ + return Object.assign({}, options, { + plugins: options.plugins.concat([ // Use object-assign polyfill in open source resolve('./scripts/babel/transform-object-assign-require'), @@ -208,7 +208,7 @@ function updateBabelConfig(babelOpts, bundleType, filename) { ]), }); default: - return babelOpts; + return options; } } @@ -220,25 +220,28 @@ function handleRollupWarnings(warning) { console.warn(warning.message || warning); } -function updateBundleConfig( - config, +function getRollupOutputOptions( filename, format, bundleType, - hasteName, + externalGlobals, + globalName, moduleType ) { - return Object.assign({}, config, { - banner: getBanner(bundleType, hasteName, filename, moduleType), - dest: Packaging.getPackageDestination( - config, + return Object.assign({}, { + banner: getBanner(bundleType, globalName, filename, moduleType), + destDir: 'build/', + dest: 'build/' + Packaging.getOutputPathRelativeToBuildFolder( bundleType, filename, - hasteName + globalName, ), footer: getFooter(bundleType, filename, moduleType), format, + globals: externalGlobals, interop: false, + moduleName: globalName, + sourceMap: false, }); } @@ -264,7 +267,7 @@ function getFormat(bundleType) { } } -function getFilename(name, hasteName, bundleType) { +function getFilename(name, globalName, bundleType) { // we do this to replace / to -, for react-dom/server name = name.replace('/', '-'); switch (bundleType) { @@ -278,16 +281,15 @@ function getFilename(name, hasteName, bundleType) { return `${name}.production.min.js`; case FB_DEV: case RN_DEV: - return `${hasteName}-dev.js`; + return `${globalName}-dev.js`; case FB_PROD: case RN_PROD: - return `${hasteName}-prod.js`; + return `${globalName}-prod.js`; } } -function uglifyConfig(configs) { +function getUglifyConfig(configs) { var mangle = configs.mangle; - var manglePropertiesOnProd = configs.manglePropertiesOnProd; var preserveVersionHeader = configs.preserveVersionHeader; var removeComments = configs.removeComments; var headerSanityCheck = configs.headerSanityCheck; @@ -326,12 +328,6 @@ function uglifyConfig(configs) { return !removeComments; }, }, - mangleProperties: mangle && manglePropertiesOnProd - ? { - ignore_quoted: true, - regex: mangleRegex, - } - : false, mangle: mangle ? { toplevel: true, @@ -341,79 +337,45 @@ function uglifyConfig(configs) { }; } -function getCommonJsConfig(bundleType) { - switch (bundleType) { - case UMD_DEV: - case UMD_PROD: - case NODE_DEV: - case NODE_PROD: - return {}; - case RN_DEV: - case RN_PROD: - return { - ignore: Modules.ignoreReactNativeModules(), - }; - case FB_DEV: - case FB_PROD: - // Modules we don't want to inline in the bundle. - // Force them to stay as require()s in the output. - return { - ignore: Modules.ignoreFBModules(), - }; - } -} - function getPlugins( entry, - babelOpts, - paths, + externalPackages, + updateBabelOptions, filename, bundleType, - hasteName, + globalName, moduleType, - manglePropertiesOnProd, modulesToStub, featureFlags ) { - // Extract error codes 1st so we can replace invariant messages in prod builds - // Without re-running the slow build script. const plugins = [ alias( - Modules.getAliases(paths, bundleType, moduleType, argv['extract-errors']) + Modules.getModuleAliases(bundleType, entry), ), - babel(updateBabelConfig(babelOpts, bundleType)), + resolvePlugin({ + // TODO: 3.0 of this plugin removed this option :-( but it seems essential. + skip: externalPackages + }), + babel(getBabelConfig(updateBabelOptions, bundleType)), ]; - - const replaceModules = Modules.getDefaultReplaceModules( - bundleType, - modulesToStub, - featureFlags - ); - - // We have to do this check because Rollup breaks on empty object. - // TODO: file an issue with rollup-plugin-replace. - if (Object.keys(replaceModules).length > 0) { - plugins.unshift(replace(replaceModules)); - } - - const headerSanityCheck = getHeaderSanityCheck(bundleType, hasteName); - + const commonJsConfig = { + ignore: Modules.getIgnoredModules(bundleType), + }; + const headerSanityCheck = getHeaderSanityCheck(bundleType, globalName); switch (bundleType) { case UMD_DEV: case NODE_DEV: case FB_DEV: plugins.push( replace(stripEnvVariables(false)), - // needs to happen after strip env - commonjs(getCommonJsConfig(bundleType)) + commonjs(commonJsConfig) ); break; case UMD_PROD: case NODE_PROD: plugins.push( replace(stripEnvVariables(true)), - // needs to happen after strip env - commonjs(getCommonJsConfig(bundleType)), + commonjs(commonJsConfig), closure({ compilationLevel: 'SIMPLE', languageIn: 'ECMASCRIPT5_STRICT', @@ -432,12 +394,10 @@ function getPlugins( case FB_PROD: plugins.push( replace(stripEnvVariables(true)), - // needs to happen after strip env - commonjs(getCommonJsConfig(bundleType)), + commonjs(commonJsConfig), uglify( uglifyConfig({ mangle: bundleType !== FB_PROD, - manglePropertiesOnProd, preserveVersionHeader: bundleType === UMD_PROD, // leave comments in for source map debugging purposes // they will be stripped as part of FB's build process @@ -451,12 +411,10 @@ function getPlugins( case RN_PROD: plugins.push( replace(stripEnvVariables(bundleType === RN_PROD)), - // needs to happen after strip env - commonjs(getCommonJsConfig(bundleType)), + commonjs(commonJsConfig), uglify( - uglifyConfig({ + getUglifyConfig({ mangle: false, - manglePropertiesOnProd, preserveVersionHeader: true, removeComments: true, headerSanityCheck, @@ -465,7 +423,6 @@ function getPlugins( ); break; } - // this needs to come last or it doesn't report sizes correctly plugins.push( sizes({ getSize: (size, gzip) => { @@ -477,7 +434,6 @@ function getPlugins( }, }) ); - return plugins; } @@ -503,44 +459,69 @@ function createBundle(bundle, bundleType) { } } - const filename = getFilename(bundle.name, bundle.hasteName, bundleType); + const filename = getFilename(bundle.output || bundle.entry, bundle.global, bundleType); const logKey = chalk.white.bold(filename) + chalk.dim(` (${bundleType.toLowerCase()})`); const format = getFormat(bundleType); - const packageName = Packaging.getPackageName(bundle.name); + const packageName = Packaging.getPackageName(bundle.entry); + + let resolvedEntry = require.resolve(bundle.entry); + if (bundleType === FB_DEV || bundleType === FB_PROD) { + const resolvedFBEntry = resolvedEntry.replace('.js', '.fb.js'); + if (fs.existsSync(resolvedFBEntry)) { + resolvedEntry = resolvedFBEntry; + } + } + + const externalGlobals = Modules.getExternalGlobals( + bundle.externals, + bundleType, + bundle.moduleType, + bundle.entry + ); + const nodeDependencies = Modules.getNodeDependencies( + bundle.entry + ); + + let externalPackages = Object.keys(externalGlobals); + if (bundleType === NODE_DEV || bundleType === NODE_PROD) { + externalPackages = externalPackages.concat(nodeDependencies); + } console.log(`${chalk.bgYellow.black(' BUILDING ')} ${logKey}`); return rollup({ - entry: bundleType === FB_DEV || bundleType === FB_PROD - ? bundle.fbEntry - : bundle.entry, - external: Modules.getExternalModules( - bundle.externals, - bundleType, - bundle.moduleType - ), + entry: resolvedEntry, + external(id) { + if (bundleType === NODE_DEV || bundleType === NODE_PROD) { + if (externalPackages.some( + dep => id === dep || id.startsWith(dep + '/') + )) { + return true; + } + } + return externalGlobals[id]; + }, onwarn: handleRollupWarnings, plugins: getPlugins( bundle.entry, - bundle.babelOpts, - bundle.paths, + externalPackages, + bundle.babel, filename, bundleType, - bundle.hasteName, + bundle.global, bundle.moduleType, - bundle.manglePropertiesOnProd, bundle.modulesToStub, bundle.featureFlags ), }) .then(result => result.write( - updateBundleConfig( - bundle.config, + getRollupOutputOptions( filename, format, bundleType, - bundle.hasteName, + externalGlobals, + bundle.global, bundle.moduleType ) ) diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index cc66ab185601..d83dea8cb098 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -36,242 +36,89 @@ const RENDERER_UTILS = moduleTypes.RENDERER_UTILS; // Standalone reconciler for third-party renderers. const RECONCILER = moduleTypes.RECONCILER; -const babelOptsReact = { - exclude: 'node_modules/**', - presets: [], - plugins: [], -}; - -const babelOptsReactART = Object.assign({}, babelOptsReact, { - // Include JSX - presets: babelOptsReact.presets.concat([ - require.resolve('babel-preset-react'), - ]), -}); - const bundles = [ /******* Isomorphic *******/ { - babelOpts: babelOptsReact, + label: 'core', bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD], - config: { - destDir: 'build/', - moduleName: 'React', - sourceMap: false, - }, - entry: 'packages/react/index.js', - externals: [ - 'create-react-class/factory', - 'prop-types', - 'prop-types/checkPropTypes', - ], - fbEntry: 'packages/react/index.js', - hasteName: 'React', moduleType: ISOMORPHIC, - label: 'core', - manglePropertiesOnProd: false, - name: 'react', - paths: ['packages/react/**/*.js', 'packages/shared/**/*.js'], + entry: 'react', + global: 'React', + externals: [], }, /******* React DOM *******/ { - babelOpts: babelOptsReact, + label: 'dom-fiber', bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD], - config: { - destDir: 'build/', - globals: { - react: 'React', - }, - moduleName: 'ReactDOM', - sourceMap: false, - }, - entry: 'packages/react-dom/index.js', - externals: ['prop-types', 'prop-types/checkPropTypes'], - fbEntry: 'packages/react-dom/index.fb.js', - hasteName: 'ReactDOM', moduleType: RENDERER, - label: 'dom-fiber', - manglePropertiesOnProd: false, - name: 'react-dom', - paths: [ - 'packages/events/**/*.js', - 'packages/react-dom/*.js', - 'packages/react-dom/src/client/**/*.js', - 'packages/react-dom/src/events/**/*.js', - 'packages/react-dom/src/shared/**/*.js', - 'packages/react-reconciler/**/*.js', - 'packages/shared/**/*.js', - ], + entry: 'react-dom', + global: 'ReactDOM', + externals: ['react'], }, + + //******* Test Utils *******/ { - babelOpts: babelOptsReact, - bundleTypes: [FB_DEV, NODE_DEV, NODE_PROD], - config: { - destDir: 'build/', - globals: { - react: 'React', - }, - moduleName: 'ReactTestUtils', - sourceMap: false, - }, - entry: 'packages/react-dom/test-utils.js', - externals: [ - 'prop-types', - 'prop-types/checkPropTypes', - 'react', - 'react-dom', - ], - fbEntry: 'packages/react-dom/test-utils.js', - hasteName: 'ReactTestUtils', - moduleType: RENDERER_UTILS, label: 'test-utils', - manglePropertiesOnProd: false, - name: 'react-dom/test-utils', - paths: [ - 'packages/events/**/*.js', - 'packages/react-dom/*.js', - 'packages/react-dom/src/events/**/*.js', - 'packages/react-dom/src/test-utils/**/*.js', - 'packages/react-dom/src/shared/**/*.js', - 'packages/shared/**/*.js', - ], + moduleType: RENDERER_UTILS, + bundleTypes: [FB_DEV, NODE_DEV, NODE_PROD], + entry: 'react-dom/test-utils', + global: 'ReactTestUtils', + externals: ['react', 'react-dom'], }, + /* React DOM internals required for react-native-web (e.g., to shim native events from react-dom) */ { - babelOpts: babelOptsReact, + label: 'dom-unstable-native-dependencies', bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD], - config: { - destDir: 'build/', - globals: { - react: 'React', - 'react-dom': 'ReactDOM', - }, - moduleName: 'ReactDOMUnstableNativeDependencies', - sourceMap: false, - }, - entry: 'packages/react-dom/unstable-native-dependencies.js', - externals: [ - 'react-dom', - 'ReactDOM', - 'prop-types', - 'prop-types/checkPropTypes', - ], - fbEntry: 'packages/react-dom/unstable-native-dependencies.js', - hasteName: 'ReactDOMUnstableNativeDependencies', moduleType: RENDERER_UTILS, - label: 'dom-unstable-native-dependencies', - manglePropertiesOnProd: false, - name: 'react-dom/unstable-native-dependencies', - paths: [ - 'packages/events/**/*.js', - 'packages/react-dom/*.js', - 'packages/react-dom/src/unstable-native-dependencies/**/*.js', - 'packages/react-dom/src/shared/**/*.js', - 'packages/shared/**/*.js', - ], + entry: 'react-dom/unstable-native-dependencies', + global: 'ReactDOMUnstableNativeDependencies', + externals: ['react', 'react-dom'], }, /******* React DOM Server *******/ { - babelOpts: babelOptsReact, + label: 'dom-server-browser', bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD], - config: { - destDir: 'build/', - globals: { - react: 'React', - }, - moduleName: 'ReactDOMServer', - sourceMap: false, - }, - entry: 'packages/react-dom/server.browser.js', - externals: ['prop-types', 'prop-types/checkPropTypes'], - fbEntry: 'packages/react-dom/server.browser.js', - hasteName: 'ReactDOMServer', moduleType: RENDERER, - label: 'dom-server-browser', - manglePropertiesOnProd: false, - name: 'react-dom/server.browser', - paths: [ - 'packages/events/**/*.js', - 'packages/react-dom/*.js', - 'packages/react-dom/src/server/**/*.js', - 'packages/react-dom/src/shared/**/*.js', - 'packages/shared/**/*.js', - ], + entry: 'react-dom/server.browser', + global: 'ReactDOMServer', + externals: ['react'], }, { - babelOpts: babelOptsReact, + label: 'dom-server-node', bundleTypes: [NODE_DEV, NODE_PROD], - config: { - destDir: 'build/', - globals: { - react: 'React', - }, - moduleName: 'ReactDOMNodeStream', - sourceMap: false, - }, - entry: 'packages/react-dom/server.js', - externals: ['prop-types', 'prop-types/checkPropTypes', 'stream'], moduleType: RENDERER, - label: 'dom-server-server-node', - manglePropertiesOnProd: false, - name: 'react-dom/server.node', - paths: [ - 'packages/events/**/*.js', - 'packages/react-dom/*.js', - 'packages/react-dom/src/server/**/*.js', - 'packages/react-dom/src/shared/**/*.js', - 'packages/shared/**/*.js', - ], + entry: 'react-dom/server', + output: 'react-dom/server.node', + externals: ['react', 'stream'] }, /******* React ART *******/ { - babelOpts: babelOptsReactART, - // TODO: we merge react-art repo into this repo so the NODE_DEV and NODE_PROD - // builds sync up to the building of the package directories + label: 'art-fiber', bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD], - config: { - destDir: 'build/', - globals: { - react: 'React', - }, - moduleName: 'ReactART', - sourceMap: false, - }, - entry: 'packages/react-art/index.js', - externals: [ - 'art/modes/current', - 'art/modes/fast-noSideEffects', - 'art/core/transform', - 'prop-types/checkPropTypes', - 'react-dom', - ], - fbEntry: 'packages/react-art/index.js', - hasteName: 'ReactART', moduleType: RENDERER, - label: 'art-fiber', - manglePropertiesOnProd: false, - name: 'react-art', - paths: [ - 'packages/react-art/**/*.js', - 'packages/react-reconciler/**/*.js', - 'packages/shared/**/*.js', - ], + entry: 'react-art', + global: 'ReactART', + externals: ['react'], + babel: opts => Object.assign({}, opts, { + // Include JSX + presets: opts.presets.concat([ + require.resolve('babel-preset-react'), + ]), + }), }, /******* React Native *******/ { - babelOpts: babelOptsReact, + label: 'native-fiber', bundleTypes: [RN_DEV, RN_PROD], - config: { - destDir: 'build/', - moduleName: 'ReactNativeFiber', - sourceMap: false, - }, - entry: 'packages/react-native-renderer/index.js', + moduleType: RENDERER, + entry: 'react-native-renderer', + global: 'ReactNativeRenderer', externals: [ 'ExceptionsManager', 'InitializeCore', @@ -283,29 +130,14 @@ const bundles = [ 'deepDiffer', 'deepFreezeAndThrowOnMutationInDev', 'flattenStyle', - 'prop-types/checkPropTypes', - ], - hasteName: 'ReactNativeRenderer', - moduleType: RENDERER, - label: 'native-fiber', - manglePropertiesOnProd: false, - name: 'react-native-renderer', - paths: [ - 'packages/events/**/*.js', - 'packages/react-native-renderer/**/*.js', - 'packages/react-reconciler/**/*.js', - 'packages/shared/**/*.js', ], }, /******* React Native RT *******/ { - babelOpts: babelOptsReact, bundleTypes: [RN_DEV, RN_PROD], config: { - destDir: 'build/', moduleName: 'ReactNativeRTFiber', - sourceMap: false, }, entry: 'packages/react-rt-renderer/index.js', externals: [ @@ -320,7 +152,6 @@ const bundles = [ moduleType: RENDERER, isRenderer: true, label: 'native-rt-fiber', - manglePropertiesOnProd: false, name: 'react-native-rt-renderer', paths: [ 'packages/events/**/*.js', @@ -333,12 +164,9 @@ const bundles = [ /******* React Native CS *******/ { - babelOpts: babelOptsReact, bundleTypes: [RN_DEV, RN_PROD], config: { - destDir: 'build/', moduleName: 'ReactNativeCSFiber', - sourceMap: false, }, entry: 'packages/react-cs-renderer/index.js', externals: ['prop-types/checkPropTypes'], @@ -346,7 +174,6 @@ const bundles = [ moduleType: RENDERER, isRenderer: true, label: 'native-cs-fiber', - manglePropertiesOnProd: false, name: 'react-native-cs-renderer', featureFlags: 'packages/react-cs-renderer/src/ReactNativeCSFeatureFlags', paths: [ @@ -360,96 +187,42 @@ const bundles = [ /******* React Test Renderer *******/ { - babelOpts: babelOptsReact, + label: 'test-fiber', bundleTypes: [FB_DEV, NODE_DEV, NODE_PROD], - config: { - destDir: 'build/', - moduleName: 'ReactTestRenderer', - sourceMap: false, - }, - entry: 'packages/react-test-renderer/index.js', - externals: ['prop-types/checkPropTypes'], - fbEntry: 'packages/react-test-renderer/index.js', - hasteName: 'ReactTestRenderer', moduleType: RENDERER, - label: 'test-fiber', - manglePropertiesOnProd: false, - name: 'react-test-renderer', - paths: [ - 'packages/events/**/*.js', - 'packages/react-test-renderer/**/*.js', - 'packages/react-reconciler/**/*.js', - 'packages/shared/**/*.js', - ], + entry: 'react-test-renderer', + global: 'ReactTestRenderer', + externals: ['react'], }, + { - babelOpts: babelOptsReact, + label: 'shallow-fiber', bundleTypes: [FB_DEV, NODE_DEV, NODE_PROD], - config: { - destDir: 'build/', - moduleName: 'ReactShallowRenderer', - sourceMap: false, - }, - entry: 'packages/react-test-renderer/shallow.js', - externals: [ - 'react-dom', - 'prop-types/checkPropTypes', - 'react-test-renderer', - ], - fbEntry: 'packages/react-test-renderer/shallow.js', - hasteName: 'ReactShallowRenderer', moduleType: RENDERER, - label: 'shallow-renderer', - manglePropertiesOnProd: false, - name: 'react-test-renderer/shallow', - paths: ['packages/react-test-renderer/**/*.js', 'packages/shared/**/*.js'], + entry: 'react-test-renderer/shallow', + global: 'ReactShallowRenderer', + externals: ['react'], }, /******* React Noop Renderer (used only for fixtures/fiber-debugger) *******/ { - babelOpts: babelOptsReact, + label: 'noop-fiber', bundleTypes: [NODE_DEV], - config: { - destDir: 'build/', - globals: { - react: 'React', - }, - moduleName: 'ReactNoop', - sourceMap: false, - }, - entry: 'packages/react-noop-renderer/index.js', - externals: ['prop-types/checkPropTypes', 'jest-matchers'], moduleType: RENDERER, - label: 'noop-fiber', - manglePropertiesOnProd: false, - name: 'react-noop-renderer', - paths: [ - 'packages/react-noop/**/*.js', - 'packages/react-reconciler/**/*.js', - 'packages/shared/**/*.js', - ], + entry: 'react-noop-renderer', + global: 'ReactNoopRenderer', + externals: ['react', 'jest-matchers'], }, /******* React Reconciler *******/ { - babelOpts: babelOptsReact, + label: 'react-reconciler', bundleTypes: [NODE_DEV, NODE_PROD], - config: { - destDir: 'build/', - globals: { - react: 'React', - }, - moduleName: 'ReactReconciler', - sourceMap: false, - }, - entry: 'packages/react-reconciler/index.js', - externals: ['react', 'prop-types/checkPropTypes'], moduleType: RECONCILER, - label: 'react-reconciler', - manglePropertiesOnProd: false, - name: 'react-reconciler', - paths: ['packages/react-reconciler/**/*.js', 'packages/shared/**/*.js'], - }, + entry: 'react-reconciler', + global: 'ReactReconciler', + externals: ['react'], + } ]; // Based on deep-freeze by substack (public domain) diff --git a/scripts/rollup/mangle.js b/scripts/rollup/mangle.js deleted file mode 100644 index 1acc08c5b362..000000000000 --- a/scripts/rollup/mangle.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; - -// these are added as they are handled by rollup in some cases -const propertyMangleWhitelist = [ - // React - 'React', - 'ReactDOM', -]; - -module.exports = { - propertyMangleWhitelist, -}; diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index e3924e964b1c..bf118a4d1499 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -1,18 +1,10 @@ 'use strict'; -const resolve = require('path').resolve; -const basename = require('path').basename; -const sync = require('glob').sync; +const path = require('path'); const bundleTypes = require('./bundles').bundleTypes; const moduleTypes = require('./bundles').moduleTypes; const extractErrorCodes = require('../error-codes/extract-errors'); -const exclude = [ - '**/__benchmarks__/**/*.js', - '**/__tests__/**/*.js', - '**/__mocks__/**/*.js', -]; - const UMD_DEV = bundleTypes.UMD_DEV; const UMD_PROD = bundleTypes.UMD_PROD; const NODE_DEV = bundleTypes.NODE_DEV; @@ -25,322 +17,62 @@ const RN_PROD = bundleTypes.RN_PROD; const ISOMORPHIC = moduleTypes.ISOMORPHIC; const RENDERER = moduleTypes.RENDERER; -const errorCodeOpts = { - errorMapFilePath: 'scripts/error-codes/codes.json', +const knownExternalGlobals = { + 'react': 'React', + 'react-dom': 'ReactDOM', }; -// these are the FBJS modules that are used throughout our bundles -const fbjsModules = [ - 'fbjs/lib/warning', - 'fbjs/lib/invariant', - 'fbjs/lib/emptyFunction', - 'fbjs/lib/emptyObject', - 'fbjs/lib/hyphenateStyleName', - 'fbjs/lib/getUnboundedScrollPosition', - 'fbjs/lib/camelizeStyleName', - 'fbjs/lib/containsNode', - 'fbjs/lib/shallowEqual', - 'fbjs/lib/getActiveElement', - 'fbjs/lib/focusNode', - 'fbjs/lib/EventListener', - 'fbjs/lib/memoizeStringOnly', - 'fbjs/lib/ExecutionEnvironment', - 'fbjs/lib/createNodesFromMarkup', - 'fbjs/lib/performanceNow', -]; - -const devOnlyFilesToStubOut = [ - "'ReactDebugCurrentFrame'", - "'ReactComponentTreeHook'", - "'ReactPerf'", - "'ReactTestUtils'", -]; - -const legacyModules = [ - 'create-react-class', - 'create-react-class/factory', - 'prop-types', - 'prop-types/checkPropTypes', -]; - -// this function builds up a very niave Haste-like moduleMap -// that works to create up an alias map for modules to link -// up to their actual disk location so Rollup can properly -// bundle them -function createModuleMap(paths, extractErrors, bundleType) { - const moduleMap = {}; - - paths.forEach(path => { - const files = sync(path, {ignore: exclude}); - - files.forEach(file => { - if (extractErrors) { - extractErrors(file); - } - const moduleName = basename(file, '.js'); - - moduleMap[moduleName] = resolve(file); - }); +function getExternalGlobals(externals, bundleType, moduleType, entry) { + const externalGlobals = {}; + + externals.forEach(name => { + if (!knownExternalGlobals[name] && ( + moduleType === UMD_DEV || + moduleType === UMD_PROD + )) { + throw new Error('Unknown global for an external: ' + name); + } + externalGlobals[name] = knownExternalGlobals[name]; }); - // if this is FB, we want to remove ReactCurrentOwner and lowPriorityWarning, - // so we can handle it with a different case - if (bundleType === FB_DEV || bundleType === FB_PROD) { - delete moduleMap.ReactCurrentOwner; - delete moduleMap.lowPriorityWarning; - } - return moduleMap; -} -function getNodeModules(bundleType, moduleType) { - // rather than adding the rollup node resolve plugin, - // we can instead deal with the only node module that is used - // for UMD bundles - object-assign - switch (bundleType) { - case UMD_DEV: - case UMD_PROD: - return { - // Bundle object-assign once in the isomorphic React, and then use - // that from the renderer UMD. Avoids bundling it in both UMDs. - 'object-assign': moduleType === ISOMORPHIC - ? resolve('./node_modules/object-assign/index.js') - : resolve('./scripts/rollup/shims/rollup/assign.js'), - // include the ART package modules directly by aliasing them from node_modules - 'art/modes/current': resolve('./node_modules/art/modes/current.js'), - 'art/modes/fast-noSideEffects': resolve( - './node_modules/art/modes/fast-noSideEffects.js' - ), - 'art/core/transform': resolve('./node_modules/art/core/transform.js'), - }; - case NODE_DEV: - case NODE_PROD: - case FB_DEV: - case FB_PROD: - case RN_DEV: - case RN_PROD: - return {}; - } + return externalGlobals; } -function ignoreFBModules() { - return [ - // These are FB-specific aliases to react and react-dom. - // Don't attempt to bundle them into other bundles. - 'React', - 'ReactDOM', - // At FB, we don't know them statically: - 'ReactFeatureFlags', - // In FB bundles, we preserve an inline require to ReactCurrentOwner. - // See the explanation in FB version of ReactCurrentOwner in www: - 'ReactCurrentOwner', - 'lowPriorityWarning', - ]; -} - -function ignoreReactNativeModules() { - return [ - // This imports NativeMethodsMixin, causing a circular dependency. - 'View', - ]; +function getNodeDependencies(entry) { + const packageJson = require( + path.basename(path.dirname(require.resolve(entry))) + '/package.json' + ); + return Array.from(new Set([ + ...Object.keys(packageJson.dependencies || {}), + ...Object.keys(packageJson.peerDependencies || {}) + ])); } -function getExternalModules(externals, bundleType, moduleType) { - // external modules tell Rollup that we should not attempt - // to bundle these modules and instead treat them as - // external dependencies to the bundle. so for CJS bundles - // this means having a require("name-of-external-module") at - // the top of the bundle. for UMD bundles this means having - // both a require and a global check for them - let externalModules = externals.slice(); +function getModuleAliases(bundleType, entry) { switch (bundleType) { case UMD_DEV: case UMD_PROD: - if (moduleType !== ISOMORPHIC) { - externalModules.push('react'); - } - break; - case NODE_DEV: - case NODE_PROD: - case RN_DEV: - case RN_PROD: - fbjsModules.forEach(module => externalModules.push(module)); - externalModules.push('object-assign'); - if (moduleType !== ISOMORPHIC) { - externalModules.push('react'); - } - break; - case FB_DEV: - case FB_PROD: - fbjsModules.forEach(module => externalModules.push(module)); - externalModules.push('object-assign'); - externalModules.push('ReactCurrentOwner'); - externalModules.push('lowPriorityWarning'); - if (moduleType !== ISOMORPHIC) { - externalModules.push('React'); - if (externalModules.indexOf('react-dom') > -1) { - externalModules.push('ReactDOM'); - } + if (getNodeDependencies(entry).indexOf('react') !== -1) { + // Optimization: rely on object-assign polyfill that is already a part + // of the React package instead of bundling it again. + return { + 'object-assign': path.resolve(__dirname + '/shims/rollup/assign.js') + }; } - break; - } - return externalModules; -} - -function getInternalModules(moduleType) { - // we tell Rollup where these files are located internally, otherwise - // it doesn't pick them up and assumes they're external - let aliases = { - reactProdInvariant: resolve('./packages/shared/reactProdInvariant.js'), - }; - if (moduleType === RENDERER) { - // Renderers bundle the whole reconciler. - aliases['react-reconciler'] = resolve( - './packages/react-reconciler/index.js' - ); - } - return aliases; -} - -function getFbjsModuleAliases(bundleType) { - switch (bundleType) { - case UMD_DEV: - case UMD_PROD: - // we want to bundle these modules, so we re-alias them to the actual - // file so Rollup can bundle them up - const fbjsModulesAlias = {}; - fbjsModules.forEach(fbjsModule => { - fbjsModulesAlias[fbjsModule] = resolve(`./node_modules/${fbjsModule}`); - }); - return fbjsModulesAlias; - case NODE_DEV: - case NODE_PROD: - case FB_DEV: - case FB_PROD: - case RN_DEV: - case RN_PROD: - // for FB we don't want to bundle the above modules, instead keep them - // as external require() calls in the bundle return {}; - } -} - -function replaceFbjsModuleAliases(bundleType) { - switch (bundleType) { - case FB_DEV: - case FB_PROD: - // Haste at FB doesn't currently allow case sensitive names, - // and product code already uses "React". In the future, - // we will either allow both variants or migrate to lowercase. - return { - "'react'": "'React'", - "'react-dom'": "'ReactDOM'", - }; default: return {}; } } -const devOnlyModuleStub = `'${resolve('./scripts/rollup/shims/rollup/DevOnlyStubShim.js')}'`; - -function replaceDevOnlyStubbedModules(bundleType) { - switch (bundleType) { - case UMD_DEV: - case NODE_DEV: - case FB_DEV: - case RN_DEV: - case RN_PROD: - return {}; - case FB_PROD: - case UMD_PROD: - case NODE_PROD: - const devOnlyModuleAliases = {}; - devOnlyFilesToStubOut.forEach(devOnlyModule => { - devOnlyModuleAliases[devOnlyModule] = devOnlyModuleStub; - }); - return devOnlyModuleAliases; - } -} - -function replaceLegacyModuleAliases(bundleType) { - switch (bundleType) { - case UMD_DEV: - case UMD_PROD: - const modulesAlias = {}; - legacyModules.forEach(legacyModule => { - const modulePath = legacyModule.includes('/') - ? legacyModule - : `${legacyModule}/index`; - const resolvedPath = resolve(`./node_modules/${modulePath}`); - modulesAlias[`'${legacyModule}'`] = `'${resolvedPath}'`; - }); - return modulesAlias; - case NODE_DEV: - case NODE_PROD: - case FB_DEV: - case FB_PROD: - case RN_DEV: - case RN_PROD: - return {}; - } -} - -function replaceBundleStubModules(bundleModulesToStub) { - const stubbedModules = {}; - - if (Array.isArray(bundleModulesToStub)) { - bundleModulesToStub.forEach(module => { - stubbedModules[`'${module}'`] = devOnlyModuleStub; - }); - } - - return stubbedModules; -} - -function getAliases(paths, bundleType, moduleType, extractErrors) { - return Object.assign( - createModuleMap( - paths, - extractErrors && extractErrorCodes(errorCodeOpts), - bundleType - ), - getInternalModules(moduleType), - getNodeModules(bundleType, moduleType), - getFbjsModuleAliases(bundleType) - ); -} - -function replaceFeatureFlags(featureFlags) { - if (!featureFlags) { - return {}; - } - return { - "'ReactFeatureFlags'": `'${resolve(featureFlags)}'`, - }; -} - -function getDefaultReplaceModules( - bundleType, - bundleModulesToStub, - featureFlags -) { - return Object.assign( - {}, - replaceFbjsModuleAliases(bundleType), - replaceDevOnlyStubbedModules(bundleType), - replaceLegacyModuleAliases(bundleType), - replaceBundleStubModules(bundleModulesToStub), - replaceFeatureFlags(featureFlags) - ); -} - -function getExcludedHasteGlobs() { - return exclude; +function getIgnoredModules(bundleType) { + // TODO + return []; } module.exports = { - getExcludedHasteGlobs, - getDefaultReplaceModules, - getAliases, - ignoreFBModules, - ignoreReactNativeModules, - getExternalModules, + getExternalGlobals, + getNodeDependencies, + getIgnoredModules, + getModuleAliases, }; diff --git a/scripts/rollup/packaging.js b/scripts/rollup/packaging.js index 64fec9f76962..3f3a3295310c 100644 --- a/scripts/rollup/packaging.js +++ b/scripts/rollup/packaging.js @@ -24,7 +24,7 @@ const facebookWWWSrcDependencies = [ // these files need to be copied to the react-native build const reactNativeSrcDependencies = [ - 'packages/react-reconciler/src/ReactTypes.js', + 'packages/shared/ReactTypes.js', 'packages/react-native-renderer/src/ReactNativeTypes.js', ]; @@ -200,27 +200,25 @@ function createNodePackage(bundleType, packageName, filename) { return Promise.resolve(); } -function getPackageDestination(config, bundleType, filename, hasteName) { - let dest = config.destDir + filename; - +function getOutputPathRelativeToBuildFolder(bundleType, filename, hasteName) { if (bundleType === FB_DEV || bundleType === FB_PROD) { - dest = `${config.destDir}${facebookWWW}/${filename}`; + return `${facebookWWW}/${filename}`; } else if (bundleType === UMD_DEV || bundleType === UMD_PROD) { - dest = `${config.destDir}dist/${filename}`; + return `dist/${filename}`; } else if (bundleType === RN_DEV || bundleType === RN_PROD) { if (hasteName === 'ReactRTRenderer') { - dest = `${config.destDir}react-rt/${filename}`; + return `react-rt/${filename}`; } else if (hasteName === 'ReactCSRenderer') { - dest = `${config.destDir}react-cs/${filename}`; + return `react-cs/${filename}`; } else { - dest = `${config.destDir}react-native/${filename}`; + return `react-native/${filename}`; } } - return dest; + return filename; } module.exports = { - getPackageDestination, + getOutputPathRelativeToBuildFolder, createNodePackage, getPackageName, createFacebookWWWBuild, diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json index 9dff0b652223..1cc97f883520 100644 --- a/scripts/rollup/results.json +++ b/scripts/rollup/results.json @@ -1,8 +1,8 @@ { "bundleSizes": { "react.development.js (UMD_DEV)": { - "size": 54803, - "gzip": 14350 + "size": 54828, + "gzip": 14397 }, "react.production.min.js (UMD_PROD)": { "size": 6634, @@ -85,8 +85,8 @@ "gzip": 15545 }, "react-dom-server.browser.development.js (UMD_DEV)": { - "size": 124902, - "gzip": 32255 + "size": 170908, + "gzip": 44043 }, "react-dom-server.browser.production.min.js (UMD_PROD)": { "size": 15337, diff --git a/yarn.lock b/yarn.lock index 4ce6d57113b0..cbd3f2bf985e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4171,7 +4171,7 @@ rollup-plugin-inject@^2.0.0: magic-string "^0.16.0" rollup-pluginutils "^1.2.0" -rollup-plugin-node-resolve@^2.0.0: +rollup-plugin-node-resolve@^2: version "2.1.1" resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-2.1.1.tgz#cbb783b0d15b02794d58915350b2f0d902b8ddc8" dependencies: From 265360d5cf40b3be185cbc36f04f59c946a16310 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 11:56:43 +0100 Subject: [PATCH 13/29] Fix FB bundles --- packages/react-dom/index.fb.js | 4 +- scripts/rollup/build.js | 78 +++++++++-------- scripts/rollup/modules.js | 84 +++++++++++++------ .../rollup/shims/rollup/DevOnlyStubShim.js | 1 - .../shims/rollup/ReactCurrentOwner-www.js | 1 + .../ReactDebugCurrentFrameRollupShim.js | 4 - .../shims/rollup/ReactFeatureFlags-www.js | 1 + .../shims/rollup/{assign.js => assign-umd.js} | 0 .../shims/rollup/lowPriorityWarning-www.js | 1 + 9 files changed, 104 insertions(+), 70 deletions(-) delete mode 100644 scripts/rollup/shims/rollup/DevOnlyStubShim.js create mode 100644 scripts/rollup/shims/rollup/ReactCurrentOwner-www.js delete mode 100644 scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js create mode 100644 scripts/rollup/shims/rollup/ReactFeatureFlags-www.js rename scripts/rollup/shims/rollup/{assign.js => assign-umd.js} (100%) create mode 100644 scripts/rollup/shims/rollup/lowPriorityWarning-www.js diff --git a/packages/react-dom/index.fb.js b/packages/react-dom/index.fb.js index 0116cf68fa21..6771b7557eeb 100644 --- a/packages/react-dom/index.fb.js +++ b/packages/react-dom/index.fb.js @@ -11,7 +11,7 @@ var ReactDOM = require('./src/client/ReactDOM'); Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, { // These are real internal dependencies that are trickier to remove: - ReactBrowserEventEmitter: require('./src/client/ReactBrowserEventEmitter'), + ReactBrowserEventEmitter: require('./src/events/ReactBrowserEventEmitter'), ReactErrorUtils: require('shared/ReactErrorUtils'), // TODO: direct imports like some-package/src/* are bad. Fix me. ReactFiberErrorLogger: require('react-reconciler/src/ReactFiberErrorLogger'), @@ -21,7 +21,7 @@ Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, { // These are dependencies of TapEventPlugin: EventPluginUtils: require('events/EventPluginUtils'), EventPropagators: require('events/EventPropagators'), - SyntheticUIEvent: require('./events/SyntheticUIEvent'), + SyntheticUIEvent: require('./src/events/SyntheticUIEvent'), }); module.exports = ReactDOM; diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index 1c0b53072185..ad4f5c223e80 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -7,7 +7,6 @@ const alias = require('rollup-plugin-alias'); const uglify = require('rollup-plugin-uglify'); const replace = require('rollup-plugin-replace'); const chalk = require('chalk'); -const escapeStringRegexp = require('escape-string-regexp'); const join = require('path').join; const resolve = require('path').resolve; const resolvePlugin = require('rollup-plugin-node-resolve'); @@ -224,7 +223,7 @@ function getRollupOutputOptions( filename, format, bundleType, - externalGlobals, + globals, globalName, moduleType ) { @@ -238,7 +237,7 @@ function getRollupOutputOptions( ), footer: getFooter(bundleType, filename, moduleType), format, - globals: externalGlobals, + globals, interop: false, moduleName: globalName, sourceMap: false, @@ -337,9 +336,17 @@ function getUglifyConfig(configs) { }; } +// FB uses require('React') instead of require('react'). +// We can't set up a forwarding module due to case sensitivity issues. +const rewriteFBReactImport = () => ({ + transformBundle(source) { + return source.replace(/require\(['"]react['"]\)/g, 'require(\'React\')') + } +}); + function getPlugins( entry, - externalPackages, + externals, updateBabelOptions, filename, bundleType, @@ -350,32 +357,27 @@ function getPlugins( ) { const plugins = [ alias( - Modules.getModuleAliases(bundleType, entry), + Modules.getShims(bundleType, entry) ), resolvePlugin({ - // TODO: 3.0 of this plugin removed this option :-( but it seems essential. - skip: externalPackages + skip: externals, }), babel(getBabelConfig(updateBabelOptions, bundleType)), ]; - const commonJsConfig = { - ignore: Modules.getIgnoredModules(bundleType), - }; const headerSanityCheck = getHeaderSanityCheck(bundleType, globalName); switch (bundleType) { case UMD_DEV: case NODE_DEV: - case FB_DEV: plugins.push( replace(stripEnvVariables(false)), - commonjs(commonJsConfig) + commonjs() ); break; case UMD_PROD: case NODE_PROD: plugins.push( replace(stripEnvVariables(true)), - commonjs(commonJsConfig), + commonjs(), closure({ compilationLevel: 'SIMPLE', languageIn: 'ECMASCRIPT5_STRICT', @@ -391,12 +393,19 @@ function getPlugins( }) ); break; + case FB_DEV: + plugins.push( + replace(stripEnvVariables(false)), + commonjs(), + rewriteFBReactImport() + ); + break; case FB_PROD: plugins.push( replace(stripEnvVariables(true)), - commonjs(commonJsConfig), + commonjs(), uglify( - uglifyConfig({ + getUglifyConfig({ mangle: bundleType !== FB_PROD, preserveVersionHeader: bundleType === UMD_PROD, // leave comments in for source map debugging purposes @@ -404,14 +413,15 @@ function getPlugins( removeComments: bundleType !== FB_PROD, headerSanityCheck, }) - ) + ), + rewriteFBReactImport() ); break; case RN_DEV: case RN_PROD: plugins.push( replace(stripEnvVariables(bundleType === RN_PROD)), - commonjs(commonJsConfig), + commonjs(), uglify( getUglifyConfig({ mangle: false, @@ -473,38 +483,32 @@ function createBundle(bundle, bundleType) { } } - const externalGlobals = Modules.getExternalGlobals( + const shouldBundleDependencies = (bundleType === UMD_DEV || bundleType === UMD_PROD); + const peerGlobals = Modules.getPeerGlobals( bundle.externals, - bundleType, - bundle.moduleType, - bundle.entry + bundle.moduleType ); - const nodeDependencies = Modules.getNodeDependencies( - bundle.entry - ); - - let externalPackages = Object.keys(externalGlobals); - if (bundleType === NODE_DEV || bundleType === NODE_PROD) { - externalPackages = externalPackages.concat(nodeDependencies); + let externals = Object.keys(peerGlobals); + if (!shouldBundleDependencies) { + const deps = Modules.getDependencies(bundleType, bundle.entry); + externals = externals.concat(deps); } console.log(`${chalk.bgYellow.black(' BUILDING ')} ${logKey}`); return rollup({ entry: resolvedEntry, external(id) { - if (bundleType === NODE_DEV || bundleType === NODE_PROD) { - if (externalPackages.some( - dep => id === dep || id.startsWith(dep + '/') - )) { - return true; - } + const containsThisModule = pkg => id === pkg || id.startsWith(pkg + '/'); + const isProvidedByDependency = externals.some(containsThisModule); + if (!shouldBundleDependencies && isProvidedByDependency) { + return true; } - return externalGlobals[id]; + return Boolean(peerGlobals[id]); }, onwarn: handleRollupWarnings, plugins: getPlugins( bundle.entry, - externalPackages, + externals, bundle.babel, filename, bundleType, @@ -520,7 +524,7 @@ function createBundle(bundle, bundleType) { filename, format, bundleType, - externalGlobals, + peerGlobals, bundle.global, bundle.moduleType ) diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index bf118a4d1499..c3e298338af1 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -17,62 +17,94 @@ const RN_PROD = bundleTypes.RN_PROD; const ISOMORPHIC = moduleTypes.ISOMORPHIC; const RENDERER = moduleTypes.RENDERER; -const knownExternalGlobals = { +// Bundles exporting globals that other modules rely on. +const knownGlobals = Object.freeze({ 'react': 'React', 'react-dom': 'ReactDOM', -}; +}); -function getExternalGlobals(externals, bundleType, moduleType, entry) { - const externalGlobals = {}; +// Redirect some modules to Haste forks in www. +// Assuming their names in www are the same, and also match +// imported names in corresponding ./shims/rollup/*-www.js shims. +const forkedFBModules = Object.freeze([ + // At FB, we don't know them statically: + 'shared/ReactFeatureFlags', + // This logic is also forked internally. + 'shared/lowPriorityWarning', + // In FB bundles, we preserve an inline require to ReactCurrentOwner. + // See the explanation in FB version of ReactCurrentOwner in www: + 'react/src/ReactCurrentOwner', +]); - externals.forEach(name => { - if (!knownExternalGlobals[name] && ( +// Given ['react'] in bundle externals, returns { 'react': 'React' }. +function getPeerGlobals(externals, moduleType) { + return externals.reduce((peerGlobals, name) => { + if (!knownGlobals[name] && ( moduleType === UMD_DEV || moduleType === UMD_PROD )) { - throw new Error('Unknown global for an external: ' + name); + throw new Error('Cannot build UMD without a global name for: ' + name); } - externalGlobals[name] = knownExternalGlobals[name]; - }); - - return externalGlobals; + peerGlobals[name] = knownGlobals[name]; + return peerGlobals + }, {}); } -function getNodeDependencies(entry) { +// Determines node_modules packages that are safe to assume will exist. +function getDependencies(bundleType, entry) { const packageJson = require( path.basename(path.dirname(require.resolve(entry))) + '/package.json' ); - return Array.from(new Set([ + // Both deps and peerDeps are assumed as accessible. + let deps = Array.from(new Set([ ...Object.keys(packageJson.dependencies || {}), - ...Object.keys(packageJson.peerDependencies || {}) + ...Object.keys(packageJson.peerDependencies || {}), ])); + // In www, forked modules are also require-able. + if (bundleType === FB_DEV || bundleType === FB_PROD) { + deps = [ + ...deps, + ...forkedFBModules.map(name => path.basename(name)), + ]; + } + return deps; } -function getModuleAliases(bundleType, entry) { +// Hijacks some modules for optimization and integration reasons. +function getShims(bundleType, entry) { switch (bundleType) { case UMD_DEV: case UMD_PROD: - if (getNodeDependencies(entry).indexOf('react') !== -1) { + if (getDependencies(bundleType, entry).indexOf('react') !== -1) { // Optimization: rely on object-assign polyfill that is already a part // of the React package instead of bundling it again. return { - 'object-assign': path.resolve(__dirname + '/shims/rollup/assign.js') + 'object-assign': path.resolve(__dirname + '/shims/rollup/assign-umd.js') }; } return {}; + case FB_DEV: + case FB_PROD: + // FB forks a few modules in www that are usually bundled. + // Instead of bundling them, they need to be kept as require()s in the + // final bundles so that they import www modules with the same names. + // Rollup doesn't make it very easy to rewrite and ignore such a require, + // so we resort to using a shim that re-exports the www module, and then + // treating shim's target destinations as external (see getDependencies). + return forkedFBModules.reduce((shims, srcPath) => { + const resolvedSrcPath = require.resolve(srcPath); + const wwwName = path.parse(resolvedSrcPath).name; + const shimPath = path.resolve(__dirname + `/shims/rollup/${wwwName}-www.js`); + shims[resolvedSrcPath] = shimPath; + return shims; + }, {}); default: return {}; } } -function getIgnoredModules(bundleType) { - // TODO - return []; -} - module.exports = { - getExternalGlobals, - getNodeDependencies, - getIgnoredModules, - getModuleAliases, + getPeerGlobals, + getDependencies, + getShims, }; diff --git a/scripts/rollup/shims/rollup/DevOnlyStubShim.js b/scripts/rollup/shims/rollup/DevOnlyStubShim.js deleted file mode 100644 index b894a23a24d5..000000000000 --- a/scripts/rollup/shims/rollup/DevOnlyStubShim.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = null; diff --git a/scripts/rollup/shims/rollup/ReactCurrentOwner-www.js b/scripts/rollup/shims/rollup/ReactCurrentOwner-www.js new file mode 100644 index 000000000000..a1b93fe0a03c --- /dev/null +++ b/scripts/rollup/shims/rollup/ReactCurrentOwner-www.js @@ -0,0 +1 @@ +module.exports = require('ReactCurrentOwner'); diff --git a/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js b/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js deleted file mode 100644 index 6d205e5b03d8..000000000000 --- a/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js +++ /dev/null @@ -1,4 +0,0 @@ -var ReactInternals = require('react') - .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED; - -module.exports = ReactInternals.ReactDebugCurrentFrame; diff --git a/scripts/rollup/shims/rollup/ReactFeatureFlags-www.js b/scripts/rollup/shims/rollup/ReactFeatureFlags-www.js new file mode 100644 index 000000000000..ea43139dcd2a --- /dev/null +++ b/scripts/rollup/shims/rollup/ReactFeatureFlags-www.js @@ -0,0 +1 @@ +module.exports = require('ReactFeatureFlags'); diff --git a/scripts/rollup/shims/rollup/assign.js b/scripts/rollup/shims/rollup/assign-umd.js similarity index 100% rename from scripts/rollup/shims/rollup/assign.js rename to scripts/rollup/shims/rollup/assign-umd.js diff --git a/scripts/rollup/shims/rollup/lowPriorityWarning-www.js b/scripts/rollup/shims/rollup/lowPriorityWarning-www.js new file mode 100644 index 000000000000..513fc8b4f789 --- /dev/null +++ b/scripts/rollup/shims/rollup/lowPriorityWarning-www.js @@ -0,0 +1 @@ +module.exports = require('lowPriorityWarning'); From 7be1b8d61564deba6d15dab1b42fc1a2c629dbc7 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 12:35:41 +0100 Subject: [PATCH 14/29] Fix RN bundles --- packages/react-cs-renderer/package.json | 6 ++- packages/react-native-renderer/package.json | 6 ++- packages/react-noop-renderer/package.json | 6 ++- packages/react-rt-renderer/package.json | 6 ++- scripts/rollup/build.js | 2 +- scripts/rollup/bundles.js | 43 +++++---------------- scripts/rollup/modules.js | 26 +++++++------ 7 files changed, 44 insertions(+), 51 deletions(-) diff --git a/packages/react-cs-renderer/package.json b/packages/react-cs-renderer/package.json index 132e8f13b4bf..212589229a90 100644 --- a/packages/react-cs-renderer/package.json +++ b/packages/react-cs-renderer/package.json @@ -5,6 +5,10 @@ "repository": "facebook/react", "dependencies": { "fbjs": "^0.8.16", - "object-assign": "^4.1.1" + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" + }, + "peerDependencies": { + "react": "^16.0.0" } } diff --git a/packages/react-native-renderer/package.json b/packages/react-native-renderer/package.json index 607a6cfe43dd..73e282f2c2ae 100644 --- a/packages/react-native-renderer/package.json +++ b/packages/react-native-renderer/package.json @@ -5,6 +5,10 @@ "repository": "facebook/react", "dependencies": { "fbjs": "^0.8.16", - "object-assign": "^4.1.1" + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" + }, + "peerDependencies": { + "react": "^16.0.0" } } diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json index e4c942fb275c..386cbfa7b8aa 100644 --- a/packages/react-noop-renderer/package.json +++ b/packages/react-noop-renderer/package.json @@ -8,7 +8,11 @@ "license": "MIT", "dependencies": { "fbjs": "^0.8.16", - "object-assign": "^4.1.1" + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" + }, + "peerDependencies": { + "react": "^16.0.0" }, "files": [ "LICENSE", diff --git a/packages/react-rt-renderer/package.json b/packages/react-rt-renderer/package.json index 3e531207757f..f9fabeabe91a 100644 --- a/packages/react-rt-renderer/package.json +++ b/packages/react-rt-renderer/package.json @@ -5,6 +5,10 @@ "repository": "facebook/react", "dependencies": { "fbjs": "^0.8.16", - "object-assign": "^4.1.1" + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" + }, + "peerDependencies": { + "react": "^16.0.0" } } diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index ad4f5c223e80..8b513cf70f32 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -357,7 +357,7 @@ function getPlugins( ) { const plugins = [ alias( - Modules.getShims(bundleType, entry) + Modules.getShims(bundleType, entry, featureFlags) ), resolvePlugin({ skip: externals, diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index d83dea8cb098..eb3365ac70db 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -135,54 +135,29 @@ const bundles = [ /******* React Native RT *******/ { + label: 'native-rt-fiber', bundleTypes: [RN_DEV, RN_PROD], - config: { - moduleName: 'ReactNativeRTFiber', - }, - entry: 'packages/react-rt-renderer/index.js', + moduleType: RENDERER, + entry: 'react-rt-renderer', + global: 'ReactRTRenderer', externals: [ 'ExceptionsManager', 'InitializeCore', 'Platform', 'BatchedBridge', 'RTManager', - 'prop-types/checkPropTypes', - ], - hasteName: 'ReactRTRenderer', - moduleType: RENDERER, - isRenderer: true, - label: 'native-rt-fiber', - name: 'react-native-rt-renderer', - paths: [ - 'packages/events/**/*.js', - 'packages/react-native-renderer/**/*.js', // This is used since we reuse the error dialog code - 'packages/react-rt-renderer/**/*.js', - 'packages/react-reconciler/**/*.js', - 'packages/shared/**/*.js', ], }, /******* React Native CS *******/ { + label: 'native-cs-fiber', bundleTypes: [RN_DEV, RN_PROD], - config: { - moduleName: 'ReactNativeCSFiber', - }, - entry: 'packages/react-cs-renderer/index.js', - externals: ['prop-types/checkPropTypes'], - hasteName: 'ReactCSRenderer', moduleType: RENDERER, - isRenderer: true, - label: 'native-cs-fiber', - name: 'react-native-cs-renderer', - featureFlags: 'packages/react-cs-renderer/src/ReactNativeCSFeatureFlags', - paths: [ - 'packages/events/**/*.js', - 'packages/react-native-renderer/**/*.js', // This is used since we reuse the error dialog code - 'packages/react-cs-renderer/**/*.js', - 'packages/react-reconciler/**/*.js', - 'packages/shared/**/*.js', - ], + entry: 'react-cs-renderer', + global: 'ReactCSRenderer', + externals: [], + featureFlags: 'react-cs-renderer/src/ReactNativeCSFeatureFlags', }, /******* React Test Renderer *******/ diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index c3e298338af1..176ec2c5f31f 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -38,7 +38,8 @@ const forkedFBModules = Object.freeze([ // Given ['react'] in bundle externals, returns { 'react': 'React' }. function getPeerGlobals(externals, moduleType) { - return externals.reduce((peerGlobals, name) => { + const peerGlobals = {}; + externals.forEach(name => { if (!knownGlobals[name] && ( moduleType === UMD_DEV || moduleType === UMD_PROD @@ -46,8 +47,8 @@ function getPeerGlobals(externals, moduleType) { throw new Error('Cannot build UMD without a global name for: ' + name); } peerGlobals[name] = knownGlobals[name]; - return peerGlobals - }, {}); + }); + return peerGlobals; } // Determines node_modules packages that are safe to assume will exist. @@ -71,16 +72,15 @@ function getDependencies(bundleType, entry) { } // Hijacks some modules for optimization and integration reasons. -function getShims(bundleType, entry) { +function getShims(bundleType, entry, featureFlags) { + const shims = {}; switch (bundleType) { case UMD_DEV: case UMD_PROD: if (getDependencies(bundleType, entry).indexOf('react') !== -1) { // Optimization: rely on object-assign polyfill that is already a part // of the React package instead of bundling it again. - return { - 'object-assign': path.resolve(__dirname + '/shims/rollup/assign-umd.js') - }; + shims['object-assign'] = path.resolve(__dirname + '/shims/rollup/assign-umd.js') } return {}; case FB_DEV: @@ -91,16 +91,18 @@ function getShims(bundleType, entry) { // Rollup doesn't make it very easy to rewrite and ignore such a require, // so we resort to using a shim that re-exports the www module, and then // treating shim's target destinations as external (see getDependencies). - return forkedFBModules.reduce((shims, srcPath) => { + forkedFBModules.forEach((srcPath) => { const resolvedSrcPath = require.resolve(srcPath); const wwwName = path.parse(resolvedSrcPath).name; const shimPath = path.resolve(__dirname + `/shims/rollup/${wwwName}-www.js`); shims[resolvedSrcPath] = shimPath; - return shims; - }, {}); - default: - return {}; + }); + break; } + if (featureFlags) { + shims[require.resolve('shared/ReactFeatureFlags')] = require.resolve(featureFlags) + }; + return shims; } module.exports = { From bfbcb724f530245b5dd97093ffe11e9c7b91b22b Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 12:58:50 +0100 Subject: [PATCH 15/29] Prettier --- scripts/print-warnings/print-warnings.js | 4 +- scripts/rollup/build.js | 56 +++++++++++++----------- scripts/rollup/bundles.js | 15 +++---- scripts/rollup/modules.js | 47 +++++++++++--------- 4 files changed, 65 insertions(+), 57 deletions(-) diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js index 4e9999396073..9d41723b7d9f 100644 --- a/scripts/print-warnings/print-warnings.js +++ b/scripts/print-warnings/print-warnings.js @@ -71,8 +71,8 @@ const sourcePaths = Bundles.bundles bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_PROD) !== -1 ) .reduce((allPaths, bundle) => allPaths.concat(bundle.paths), []); - // TODO: this is broken. - // .concat(Modules.getExcludedHasteGlobs().map(glob => `!${glob}`)); +// TODO: this is broken. +// .concat(Modules.getExcludedHasteGlobs().map(glob => `!${glob}`)); gs(sourcePaths).pipe( through.obj(transform, cb => { diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index 8b513cf70f32..f58a42ba0bc2 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -227,21 +227,25 @@ function getRollupOutputOptions( globalName, moduleType ) { - return Object.assign({}, { - banner: getBanner(bundleType, globalName, filename, moduleType), - destDir: 'build/', - dest: 'build/' + Packaging.getOutputPathRelativeToBuildFolder( - bundleType, - filename, - globalName, - ), - footer: getFooter(bundleType, filename, moduleType), - format, - globals, - interop: false, - moduleName: globalName, - sourceMap: false, - }); + return Object.assign( + {}, + { + banner: getBanner(bundleType, globalName, filename, moduleType), + destDir: 'build/', + dest: 'build/' + + Packaging.getOutputPathRelativeToBuildFolder( + bundleType, + filename, + globalName + ), + footer: getFooter(bundleType, filename, moduleType), + format, + globals, + interop: false, + moduleName: globalName, + sourceMap: false, + } + ); } function stripEnvVariables(production) { @@ -340,8 +344,8 @@ function getUglifyConfig(configs) { // We can't set up a forwarding module due to case sensitivity issues. const rewriteFBReactImport = () => ({ transformBundle(source) { - return source.replace(/require\(['"]react['"]\)/g, 'require(\'React\')') - } + return source.replace(/require\(['"]react['"]\)/g, "require('React')"); + }, }); function getPlugins( @@ -356,9 +360,7 @@ function getPlugins( featureFlags ) { const plugins = [ - alias( - Modules.getShims(bundleType, entry, featureFlags) - ), + alias(Modules.getShims(bundleType, entry, featureFlags)), resolvePlugin({ skip: externals, }), @@ -368,10 +370,7 @@ function getPlugins( switch (bundleType) { case UMD_DEV: case NODE_DEV: - plugins.push( - replace(stripEnvVariables(false)), - commonjs() - ); + plugins.push(replace(stripEnvVariables(false)), commonjs()); break; case UMD_PROD: case NODE_PROD: @@ -469,7 +468,11 @@ function createBundle(bundle, bundleType) { } } - const filename = getFilename(bundle.output || bundle.entry, bundle.global, bundleType); + const filename = getFilename( + bundle.output || bundle.entry, + bundle.global, + bundleType + ); const logKey = chalk.white.bold(filename) + chalk.dim(` (${bundleType.toLowerCase()})`); const format = getFormat(bundleType); @@ -483,7 +486,8 @@ function createBundle(bundle, bundleType) { } } - const shouldBundleDependencies = (bundleType === UMD_DEV || bundleType === UMD_PROD); + const shouldBundleDependencies = + bundleType === UMD_DEV || bundleType === UMD_PROD; const peerGlobals = Modules.getPeerGlobals( bundle.externals, bundle.moduleType diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index eb3365ac70db..3f2b9fdb59df 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -93,7 +93,7 @@ const bundles = [ moduleType: RENDERER, entry: 'react-dom/server', output: 'react-dom/server.node', - externals: ['react', 'stream'] + externals: ['react', 'stream'], }, /******* React ART *******/ @@ -104,12 +104,11 @@ const bundles = [ entry: 'react-art', global: 'ReactART', externals: ['react'], - babel: opts => Object.assign({}, opts, { - // Include JSX - presets: opts.presets.concat([ - require.resolve('babel-preset-react'), - ]), - }), + babel: opts => + Object.assign({}, opts, { + // Include JSX + presets: opts.presets.concat([require.resolve('babel-preset-react')]), + }), }, /******* React Native *******/ @@ -197,7 +196,7 @@ const bundles = [ entry: 'react-reconciler', global: 'ReactReconciler', externals: ['react'], - } + }, ]; // Based on deep-freeze by substack (public domain) diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index 176ec2c5f31f..a800c8205698 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -19,7 +19,7 @@ const RENDERER = moduleTypes.RENDERER; // Bundles exporting globals that other modules rely on. const knownGlobals = Object.freeze({ - 'react': 'React', + react: 'React', 'react-dom': 'ReactDOM', }); @@ -40,10 +40,10 @@ const forkedFBModules = Object.freeze([ function getPeerGlobals(externals, moduleType) { const peerGlobals = {}; externals.forEach(name => { - if (!knownGlobals[name] && ( - moduleType === UMD_DEV || - moduleType === UMD_PROD - )) { + if ( + !knownGlobals[name] && + (moduleType === UMD_DEV || moduleType === UMD_PROD) + ) { throw new Error('Cannot build UMD without a global name for: ' + name); } peerGlobals[name] = knownGlobals[name]; @@ -53,20 +53,19 @@ function getPeerGlobals(externals, moduleType) { // Determines node_modules packages that are safe to assume will exist. function getDependencies(bundleType, entry) { - const packageJson = require( - path.basename(path.dirname(require.resolve(entry))) + '/package.json' - ); + const packageJson = require(path.basename( + path.dirname(require.resolve(entry)) + ) + '/package.json'); // Both deps and peerDeps are assumed as accessible. - let deps = Array.from(new Set([ - ...Object.keys(packageJson.dependencies || {}), - ...Object.keys(packageJson.peerDependencies || {}), - ])); + let deps = Array.from( + new Set([ + ...Object.keys(packageJson.dependencies || {}), + ...Object.keys(packageJson.peerDependencies || {}), + ]) + ); // In www, forked modules are also require-able. if (bundleType === FB_DEV || bundleType === FB_PROD) { - deps = [ - ...deps, - ...forkedFBModules.map(name => path.basename(name)), - ]; + deps = [...deps, ...forkedFBModules.map(name => path.basename(name))]; } return deps; } @@ -80,7 +79,9 @@ function getShims(bundleType, entry, featureFlags) { if (getDependencies(bundleType, entry).indexOf('react') !== -1) { // Optimization: rely on object-assign polyfill that is already a part // of the React package instead of bundling it again. - shims['object-assign'] = path.resolve(__dirname + '/shims/rollup/assign-umd.js') + shims['object-assign'] = path.resolve( + __dirname + '/shims/rollup/assign-umd.js' + ); } return {}; case FB_DEV: @@ -91,17 +92,21 @@ function getShims(bundleType, entry, featureFlags) { // Rollup doesn't make it very easy to rewrite and ignore such a require, // so we resort to using a shim that re-exports the www module, and then // treating shim's target destinations as external (see getDependencies). - forkedFBModules.forEach((srcPath) => { + forkedFBModules.forEach(srcPath => { const resolvedSrcPath = require.resolve(srcPath); const wwwName = path.parse(resolvedSrcPath).name; - const shimPath = path.resolve(__dirname + `/shims/rollup/${wwwName}-www.js`); + const shimPath = path.resolve( + __dirname + `/shims/rollup/${wwwName}-www.js` + ); shims[resolvedSrcPath] = shimPath; }); break; } if (featureFlags) { - shims[require.resolve('shared/ReactFeatureFlags')] = require.resolve(featureFlags) - }; + shims[require.resolve('shared/ReactFeatureFlags')] = require.resolve( + featureFlags + ); + } return shims; } From a15dc5c4e36ad1981afafdd0d0469d6ab15b691e Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 13:02:09 +0100 Subject: [PATCH 16/29] Fix lint --- scripts/print-warnings/print-warnings.js | 7 +++++-- scripts/rollup/build.js | 2 +- scripts/rollup/modules.js | 9 ++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js index 9d41723b7d9f..3f00d3a3727f 100644 --- a/scripts/print-warnings/print-warnings.js +++ b/scripts/print-warnings/print-warnings.js @@ -71,8 +71,11 @@ const sourcePaths = Bundles.bundles bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_PROD) !== -1 ) .reduce((allPaths, bundle) => allPaths.concat(bundle.paths), []); -// TODO: this is broken. -// .concat(Modules.getExcludedHasteGlobs().map(glob => `!${glob}`)); + .concat([ + '!**/__benchmarks__/**/*.js', + '!**/__tests__/**/*.js', + '!**/__mocks__/**/*.js', + ]); gs(sourcePaths).pipe( through.obj(transform, cb => { diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index f58a42ba0bc2..e73ade27e1f5 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -507,7 +507,7 @@ function createBundle(bundle, bundleType) { if (!shouldBundleDependencies && isProvidedByDependency) { return true; } - return Boolean(peerGlobals[id]); + return !!peerGlobals[id]; }, onwarn: handleRollupWarnings, plugins: getPlugins( diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index a800c8205698..342780e4e860 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -3,19 +3,14 @@ const path = require('path'); const bundleTypes = require('./bundles').bundleTypes; const moduleTypes = require('./bundles').moduleTypes; + +// TODO const extractErrorCodes = require('../error-codes/extract-errors'); const UMD_DEV = bundleTypes.UMD_DEV; const UMD_PROD = bundleTypes.UMD_PROD; -const NODE_DEV = bundleTypes.NODE_DEV; -const NODE_PROD = bundleTypes.NODE_PROD; const FB_DEV = bundleTypes.FB_DEV; const FB_PROD = bundleTypes.FB_PROD; -const RN_DEV = bundleTypes.RN_DEV; -const RN_PROD = bundleTypes.RN_PROD; - -const ISOMORPHIC = moduleTypes.ISOMORPHIC; -const RENDERER = moduleTypes.RENDERER; // Bundles exporting globals that other modules rely on. const knownGlobals = Object.freeze({ From 18f3f617bf37a337f36bcc725b012642c561f4c6 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 13:29:35 +0100 Subject: [PATCH 17/29] Fix warning printing and error codes --- scripts/error-codes/extract-errors.js | 4 +-- .../replace-invariant-error-codes.js | 10 ++++-- scripts/print-warnings/print-warnings.js | 15 +------- scripts/rollup/build.js | 35 +++++++++++++++---- scripts/rollup/modules.js | 3 -- 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/scripts/error-codes/extract-errors.js b/scripts/error-codes/extract-errors.js index cbf32790ddcb..fcf72e228576 100644 --- a/scripts/error-codes/extract-errors.js +++ b/scripts/error-codes/extract-errors.js @@ -95,9 +95,7 @@ module.exports = function(opts) { ); } - return function extractErrors(filepath) { - const source = fs.readFileSync(filepath, 'utf-8'); - + return function extractErrors(source) { transform(source); flush(); }; diff --git a/scripts/error-codes/replace-invariant-error-codes.js b/scripts/error-codes/replace-invariant-error-codes.js index 87ca56039ebe..2bcb5c4c47ba 100644 --- a/scripts/error-codes/replace-invariant-error-codes.js +++ b/scripts/error-codes/replace-invariant-error-codes.js @@ -6,12 +6,10 @@ */ 'use strict'; +var fs = require('fs'); var evalToString = require('../shared/evalToString'); -var existingErrorMap = require('./codes.json'); var invertObject = require('./invertObject'); -var errorMap = invertObject(existingErrorMap); - module.exports = function(babel) { var t = babel.types; @@ -101,6 +99,12 @@ module.exports = function(babel) { devInvariant[SEEN_SYMBOL] = true; + // Avoid caching because we write it as we go. + var existingErrorMap = JSON.parse( + fs.readFileSync(__dirname + '/codes.json', 'utf-8') + ); + var errorMap = invertObject(existingErrorMap); + var localInvariantId = getProdInvariantIdentifier(path, this); var prodErrorId = errorMap[errorMsgLiteral]; var body = null; diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js index 3f00d3a3727f..f99ceb794f20 100644 --- a/scripts/print-warnings/print-warnings.js +++ b/scripts/print-warnings/print-warnings.js @@ -64,20 +64,7 @@ function transform(file, enc, cb) { }); } -const sourcePaths = Bundles.bundles - .filter( - bundle => - bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_DEV) !== -1 || - bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_PROD) !== -1 - ) - .reduce((allPaths, bundle) => allPaths.concat(bundle.paths), []); - .concat([ - '!**/__benchmarks__/**/*.js', - '!**/__tests__/**/*.js', - '!**/__mocks__/**/*.js', - ]); - -gs(sourcePaths).pipe( +gs(['packages/**/*.js', '!**/__tests__/**/*.js', '!**/__mocks__/**/*.js']).pipe( through.obj(transform, cb => { process.stdout.write(Array.from(warnings).sort().join('\n') + '\n'); cb(); diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index e73ade27e1f5..f43da328acd7 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -17,6 +17,7 @@ const Modules = require('./modules'); const Bundles = require('./bundles'); const sizes = require('./plugins/sizes-plugin'); const Stats = require('./stats'); +const extractErrorCodes = require('../error-codes/extract-errors'); const syncReactDom = require('./sync').syncReactDom; const syncReactNative = require('./sync').syncReactNative; const syncReactNativeRT = require('./sync').syncReactNativeRT; @@ -45,6 +46,10 @@ const requestedBundleNames = (argv._[0] || '') .map(type => type.toLowerCase()); const syncFbsource = argv['sync-fbsource']; const syncWww = argv['sync-www']; +const shouldExtractErrors = argv['extract-errors']; +const errorCodeOpts = { + errorMapFilePath: 'scripts/error-codes/codes.json', +}; function getHeaderSanityCheck(bundleType, globalName) { switch (bundleType) { @@ -342,11 +347,25 @@ function getUglifyConfig(configs) { // FB uses require('React') instead of require('react'). // We can't set up a forwarding module due to case sensitivity issues. -const rewriteFBReactImport = () => ({ - transformBundle(source) { - return source.replace(/require\(['"]react['"]\)/g, "require('React')"); - }, -}); +function rewriteFBReactImport() { + return { + transformBundle(source) { + return source.replace(/require\(['"]react['"]\)/g, "require('React')"); + }, + }; +} + +// Plugin that writes to the error code file so that by the time it is picked +// up by Babel, the errors are already extracted. +function writeErrorCodes() { + const flush = extractErrorCodes(errorCodeOpts); + return { + transform(source) { + flush(source); + return source; + }, + }; +} function getPlugins( entry, @@ -360,12 +379,14 @@ function getPlugins( featureFlags ) { const plugins = [ + shouldExtractErrors && writeErrorCodes(), alias(Modules.getShims(bundleType, entry, featureFlags)), resolvePlugin({ skip: externals, }), babel(getBabelConfig(updateBabelOptions, bundleType)), - ]; + ].filter(Boolean); + const headerSanityCheck = getHeaderSanityCheck(bundleType, globalName); switch (bundleType) { case UMD_DEV: @@ -600,7 +621,7 @@ rimraf('build', () => { console.log(Stats.printResults()); // save the results for next run Stats.saveResults(); - if (argv['extract-errors']) { + if (shouldExtractErrors) { console.warn( '\nWarning: this build was created with --extract-errors enabled.\n' + 'this will result in extremely slow builds and should only be\n' + diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index 342780e4e860..894f296ffef3 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -4,9 +4,6 @@ const path = require('path'); const bundleTypes = require('./bundles').bundleTypes; const moduleTypes = require('./bundles').moduleTypes; -// TODO -const extractErrorCodes = require('../error-codes/extract-errors'); - const UMD_DEV = bundleTypes.UMD_DEV; const UMD_PROD = bundleTypes.UMD_PROD; const FB_DEV = bundleTypes.FB_DEV; From a9ac2f5f6190d04cfdc8194c2757a1366e4a0607 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 14:01:15 +0100 Subject: [PATCH 18/29] Fix buggy return --- scripts/rollup/modules.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index 894f296ffef3..38314f88a91d 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -75,7 +75,7 @@ function getShims(bundleType, entry, featureFlags) { __dirname + '/shims/rollup/assign-umd.js' ); } - return {}; + break; case FB_DEV: case FB_PROD: // FB forks a few modules in www that are usually bundled. From 174df0a509836e2accee1327777842edcd690a90 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 19:03:25 +0100 Subject: [PATCH 19/29] Fix lint and Flow --- packages/react-dom/src/events/SimpleEventPlugin.js | 2 +- scripts/print-warnings/print-warnings.js | 2 -- scripts/rollup/modules.js | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js index 2f871a59670f..f0e66fa1c7ee 100644 --- a/packages/react-dom/src/events/SimpleEventPlugin.js +++ b/packages/react-dom/src/events/SimpleEventPlugin.js @@ -28,7 +28,7 @@ if (__DEV__) { var warning = require('fbjs/lib/warning'); } -import type {TopLevelTypes} from 'events/BrowserEventConstants'; +import type {TopLevelTypes} from './BrowserEventConstants'; import type { DispatchConfig, ReactSyntheticEvent, diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js index f99ceb794f20..df638ce6cc02 100644 --- a/scripts/print-warnings/print-warnings.js +++ b/scripts/print-warnings/print-warnings.js @@ -11,8 +11,6 @@ const fs = require('fs'); const through = require('through2'); const traverse = require('babel-traverse').default; const gs = require('glob-stream'); -const Bundles = require('../rollup/bundles'); -const Modules = require('../rollup/modules'); const evalToString = require('../shared/evalToString'); diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js index 38314f88a91d..1fd9bb2bc2b1 100644 --- a/scripts/rollup/modules.js +++ b/scripts/rollup/modules.js @@ -2,7 +2,6 @@ const path = require('path'); const bundleTypes = require('./bundles').bundleTypes; -const moduleTypes = require('./bundles').moduleTypes; const UMD_DEV = bundleTypes.UMD_DEV; const UMD_PROD = bundleTypes.UMD_PROD; From 4d423584893d513416d44b40a34f57170615f4dd Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 19:10:58 +0100 Subject: [PATCH 20/29] Use Yarn on CI --- scripts/circleci/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/circleci/build.sh b/scripts/circleci/build.sh index edd97f88925f..a52233685bd8 100755 --- a/scripts/circleci/build.sh +++ b/scripts/circleci/build.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e - -npm run build -- --extract-errors + +yarn build --extract-errors git checkout -- scripts/error-codes/codes.json # Check that the standalone reconciler isn't borked From 958792f1827594de7c656b6830c2575109829666 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 19:14:41 +0100 Subject: [PATCH 21/29] Unbreak Jest --- package.json | 2 +- scripts/jest/preprocessor.js | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 6de436502e9a..d1b4f6690d77 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ ".*": "./scripts/jest/preprocessor.js" }, "transformIgnorePatterns": [ - "/node_modules/(?!react)" + "/node_modules/(?!react|shared|events)" ], "setupFiles": [ "./scripts/jest/setup.js", diff --git a/scripts/jest/preprocessor.js b/scripts/jest/preprocessor.js index 3ea40a5364e1..7602665f8349 100644 --- a/scripts/jest/preprocessor.js +++ b/scripts/jest/preprocessor.js @@ -11,11 +11,6 @@ var babel = require('babel-core'); var coffee = require('coffee-script'); var tsPreprocessor = require('./ts-preprocessor'); - -// This assumes the module map has been built. This might not be safe. -// We should consider consuming this from a built fbjs module from npm. -var moduleMap = require('fbjs/module-map'); -var babelPluginModules = require('fbjs-scripts/babel-6/rewrite-modules'); var createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction'); // Use require.resolve to be resilient to file moves, npm updates, etc @@ -40,15 +35,7 @@ var pathToErrorCodes = require.resolve('../error-codes/codes.json'); // TODO: make sure this stays in sync with gulpfile var babelOptions = { plugins: [ - pathToBabelPluginDevWithCode, // this pass has to run before `rewrite-modules` - [ - babelPluginModules, - { - map: Object.assign({}, moduleMap, { - 'object-assign': 'object-assign', - }), - }, - ], + pathToBabelPluginDevWithCode, // Keep stacks detailed in tests. // Don't put this in .babelrc so that we don't embed filenames // into ReactART builds that include JSX. From 4de7c15c20b892ae1291fe12050db340b0e671bc Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 19:22:34 +0100 Subject: [PATCH 22/29] Fix lint --- packages/react-native-renderer/src/ReactNativeRenderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index 4c9a0e2b0a28..4396c9ad6058 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -103,7 +103,7 @@ const ReactNativeRenderer: ReactNativeType = { ReactNativeComponentTree: require('./ReactNativeComponentTree'), // InspectorUtils, ScrollResponder ReactNativePropRegistry: require('./ReactNativePropRegistry'), // flattenStyle, Stylesheet TouchHistoryMath: require('events/TouchHistoryMath'), // PanResponder - createReactNativeComponentClass: require('./createReactNativeComponentClass'), // eg RCTText, RCTView, ReactNativeART + createReactNativeComponentClass: require('./createReactNativeComponentClass'), // RCTText, RCTView, ReactNativeART takeSnapshot: require('./takeSnapshot'), // react-native-implementation }, }; From 474fd264f55f2e5e55c20b63f5dc5f2ea0086225 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 22:14:14 +0100 Subject: [PATCH 23/29] Fix aliased originals getting included in DEV Shouldn't affect correctness (they were ignored) but fixes DEV size regression. --- scripts/rollup/build.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index f43da328acd7..62db4b44186f 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -345,6 +345,23 @@ function getUglifyConfig(configs) { }; } +// We use this for various shims, such as www forks of the code, +// renderer-specific feature flag overrides, and UMD optimizations. +function shimModules(shims) { + // For some reason, even if we use the alias plugin, + // Rollup still attempts to bundle unused original code + // if it exists. We have to explicitly stub it out. + const nullStub = { + transform(source, id) { + if (shims[id]) { + return 'module.exports = null;'; + } + return source; + }, + }; + return [nullStub, alias(shims)]; +} + // FB uses require('React') instead of require('react'). // We can't set up a forwarding module due to case sensitivity issues. function rewriteFBReactImport() { @@ -378,9 +395,10 @@ function getPlugins( modulesToStub, featureFlags ) { + const shims = Modules.getShims(bundleType, entry, featureFlags); const plugins = [ shouldExtractErrors && writeErrorCodes(), - alias(Modules.getShims(bundleType, entry, featureFlags)), + ...shimModules(shims), resolvePlugin({ skip: externals, }), From eceb3014e3b38bf2abb7de79400cb2c51257945f Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 22:22:06 +0100 Subject: [PATCH 24/29] Record sizes --- scripts/rollup/results.json | 158 ++++++++++++++++++------------------ 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json index 1cc97f883520..fd7f2080da2d 100644 --- a/scripts/rollup/results.json +++ b/scripts/rollup/results.json @@ -1,204 +1,204 @@ { "bundleSizes": { "react.development.js (UMD_DEV)": { - "size": 54828, - "gzip": 14397 + "size": 54574, + "gzip": 14304 }, "react.production.min.js (UMD_PROD)": { "size": 6634, "gzip": 2764 }, "react.development.js (NODE_DEV)": { - "size": 45707, - "gzip": 12095 + "size": 45478, + "gzip": 12054 }, "react.production.min.js (NODE_PROD)": { "size": 5611, "gzip": 2364 }, "React-dev.js (FB_DEV)": { - "size": 43033, - "gzip": 11331 + "size": 42953, + "gzip": 11326 }, "React-prod.js (FB_PROD)": { - "size": 24848, - "gzip": 6713 + "size": 24830, + "gzip": 6718 }, "react-dom.development.js (UMD_DEV)": { - "size": 628875, - "gzip": 144023 + "size": 628275, + "gzip": 144026 }, "react-dom.production.min.js (UMD_PROD)": { - "size": 100571, - "gzip": 31752 + "size": 100910, + "gzip": 31885 }, "react-dom.development.js (NODE_DEV)": { - "size": 591158, - "gzip": 135256 + "size": 590510, + "gzip": 135251 }, "react-dom.production.min.js (NODE_PROD)": { - "size": 107130, - "gzip": 33570 + "size": 107143, + "gzip": 33563 }, "ReactDOM-dev.js (FB_DEV)": { - "size": 588384, - "gzip": 134603 + "size": 587573, + "gzip": 134618 }, "ReactDOM-prod.js (FB_PROD)": { - "size": 418558, - "gzip": 92979 + "size": 418348, + "gzip": 92934 }, "react-dom-test-utils.development.js (NODE_DEV)": { - "size": 41743, - "gzip": 11118 + "size": 41554, + "gzip": 11082 }, "react-dom-test-utils.production.min.js (NODE_PROD)": { "size": 11608, "gzip": 4241 }, "ReactTestUtils-dev.js (FB_DEV)": { - "size": 41569, - "gzip": 11069 + "size": 41172, + "gzip": 11056 }, "react-dom-unstable-native-dependencies.development.js (UMD_DEV)": { - "size": 84961, - "gzip": 21296 + "size": 84862, + "gzip": 21266 }, "react-dom-unstable-native-dependencies.production.min.js (UMD_PROD)": { "size": 14441, "gzip": 4650 }, "react-dom-unstable-native-dependencies.development.js (NODE_DEV)": { - "size": 80754, - "gzip": 19972 + "size": 80643, + "gzip": 19931 }, "react-dom-unstable-native-dependencies.production.min.js (NODE_PROD)": { "size": 14003, "gzip": 4510 }, "ReactDOMUnstableNativeDependencies-dev.js (FB_DEV)": { - "size": 80207, - "gzip": 19890 + "size": 80136, + "gzip": 19877 }, "ReactDOMUnstableNativeDependencies-prod.js (FB_PROD)": { - "size": 65181, - "gzip": 15545 + "size": 65144, + "gzip": 15540 }, "react-dom-server.browser.development.js (UMD_DEV)": { - "size": 170908, - "gzip": 44043 + "size": 124580, + "gzip": 32216 }, "react-dom-server.browser.production.min.js (UMD_PROD)": { "size": 15337, "gzip": 5967 }, "react-dom-server.browser.development.js (NODE_DEV)": { - "size": 94822, - "gzip": 25134 + "size": 94467, + "gzip": 25081 }, "react-dom-server.browser.production.min.js (NODE_PROD)": { "size": 15063, "gzip": 5899 }, "ReactDOMServer-dev.js (FB_DEV)": { - "size": 94499, - "gzip": 25066 + "size": 93943, + "gzip": 25012 }, "ReactDOMServer-prod.js (FB_PROD)": { - "size": 42463, + "size": 42426, "gzip": 11846 }, "react-dom-server.node.development.js (NODE_DEV)": { - "size": 97084, - "gzip": 25683 + "size": 96729, + "gzip": 25627 }, "react-dom-server.node.production.min.js (NODE_PROD)": { "size": 15988, "gzip": 6235 }, "react-art.development.js (UMD_DEV)": { - "size": 376187, - "gzip": 82324 + "size": 374324, + "gzip": 82151 }, "react-art.production.min.js (UMD_PROD)": { - "size": 82965, - "gzip": 25790 + "size": 82762, + "gzip": 25775 }, "react-art.development.js (NODE_DEV)": { - "size": 300546, - "gzip": 63199 + "size": 300081, + "gzip": 63132 }, "react-art.production.min.js (NODE_PROD)": { - "size": 54380, - "gzip": 17024 + "size": 54393, + "gzip": 17033 }, "ReactART-dev.js (FB_DEV)": { - "size": 299425, - "gzip": 63131 + "size": 298687, + "gzip": 63040 }, "ReactART-prod.js (FB_PROD)": { - "size": 224127, - "gzip": 46026 + "size": 223978, + "gzip": 46012 }, "ReactNativeRenderer-dev.js (RN_DEV)": { - "size": 286133, - "gzip": 49281 + "size": 286147, + "gzip": 49197 }, "ReactNativeRenderer-prod.js (RN_PROD)": { - "size": 223833, - "gzip": 38518 + "size": 223837, + "gzip": 38577 }, "ReactRTRenderer-dev.js (RN_DEV)": { - "size": 217990, - "gzip": 36810 + "size": 218004, + "gzip": 36738 }, "ReactRTRenderer-prod.js (RN_PROD)": { - "size": 165476, - "gzip": 27536 + "size": 165480, + "gzip": 27593 }, "ReactCSRenderer-dev.js (RN_DEV)": { "size": 210411, - "gzip": 35053 + "gzip": 35016 }, "ReactCSRenderer-prod.js (RN_PROD)": { "size": 160471, - "gzip": 26346 + "gzip": 26308 }, "react-test-renderer.development.js (NODE_DEV)": { - "size": 304403, - "gzip": 63639 + "size": 303938, + "gzip": 63567 }, "react-test-renderer.production.min.js (NODE_PROD)": { - "size": 55973, - "gzip": 17246 + "size": 55986, + "gzip": 17251 }, "ReactTestRenderer-dev.js (FB_DEV)": { - "size": 303243, - "gzip": 63566 + "size": 302534, + "gzip": 63485 }, "react-test-renderer-shallow.development.js (NODE_DEV)": { - "size": 9364, - "gzip": 2335 + "size": 9290, + "gzip": 2321 }, "react-test-renderer-shallow.production.min.js (NODE_PROD)": { "size": 4630, "gzip": 1665 }, "ReactShallowRenderer-dev.js (FB_DEV)": { - "size": 9037, - "gzip": 2262 + "size": 9002, + "gzip": 2256 }, "react-noop-renderer.development.js (NODE_DEV)": { - "size": 293612, - "gzip": 60826 + "size": 293219, + "gzip": 60806 }, "react-reconciler.development.js (NODE_DEV)": { - "size": 279284, - "gzip": 57666 + "size": 281633, + "gzip": 58459 }, "react-reconciler.production.min.js (NODE_PROD)": { - "size": 38232, - "gzip": 11939 + "size": 38245, + "gzip": 11943 } } } \ No newline at end of file From e5667284ab9d85fae4d9f6ac7b7bf0f44fc05af3 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Tue, 24 Oct 2017 22:24:58 +0100 Subject: [PATCH 25/29] Fix weird version in package.json --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d1b4f6690d77..0299ddf55236 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "rollup-plugin-closure-compiler-js": "^1.0.4", "rollup-plugin-commonjs": "^8.0.2", "rollup-plugin-inject": "^2.0.0", - "rollup-plugin-node-resolve": "^2", + "rollup-plugin-node-resolve": "^2.0.0", "rollup-plugin-replace": "^1.1.1", "rollup-plugin-uglify": "^1.0.1", "run-sequence": "^1.1.4", diff --git a/yarn.lock b/yarn.lock index cbd3f2bf985e..4ce6d57113b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4171,7 +4171,7 @@ rollup-plugin-inject@^2.0.0: magic-string "^0.16.0" rollup-pluginutils "^1.2.0" -rollup-plugin-node-resolve@^2: +rollup-plugin-node-resolve@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-2.1.1.tgz#cbb783b0d15b02794d58915350b2f0d902b8ddc8" dependencies: From 42b661373bcde4f6ae1d9fc94171d2b728734c1a Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 25 Oct 2017 00:13:28 +0100 Subject: [PATCH 26/29] Tweak bundle labels --- scripts/rollup/bundles.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 3f2b9fdb59df..754559cfaa67 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -49,7 +49,7 @@ const bundles = [ /******* React DOM *******/ { - label: 'dom-fiber', + label: 'dom-client', bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD], moduleType: RENDERER, entry: 'react-dom', @@ -59,7 +59,7 @@ const bundles = [ //******* Test Utils *******/ { - label: 'test-utils', + label: 'dom-test-utils', moduleType: RENDERER_UTILS, bundleTypes: [FB_DEV, NODE_DEV, NODE_PROD], entry: 'react-dom/test-utils', @@ -98,7 +98,7 @@ const bundles = [ /******* React ART *******/ { - label: 'art-fiber', + label: 'art', bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD], moduleType: RENDERER, entry: 'react-art', @@ -113,7 +113,7 @@ const bundles = [ /******* React Native *******/ { - label: 'native-fiber', + label: 'native', bundleTypes: [RN_DEV, RN_PROD], moduleType: RENDERER, entry: 'react-native-renderer', @@ -134,7 +134,7 @@ const bundles = [ /******* React Native RT *******/ { - label: 'native-rt-fiber', + label: 'native-rt', bundleTypes: [RN_DEV, RN_PROD], moduleType: RENDERER, entry: 'react-rt-renderer', @@ -150,7 +150,7 @@ const bundles = [ /******* React Native CS *******/ { - label: 'native-cs-fiber', + label: 'native-cs', bundleTypes: [RN_DEV, RN_PROD], moduleType: RENDERER, entry: 'react-cs-renderer', @@ -161,7 +161,7 @@ const bundles = [ /******* React Test Renderer *******/ { - label: 'test-fiber', + label: 'test', bundleTypes: [FB_DEV, NODE_DEV, NODE_PROD], moduleType: RENDERER, entry: 'react-test-renderer', @@ -170,7 +170,7 @@ const bundles = [ }, { - label: 'shallow-fiber', + label: 'test-shallow', bundleTypes: [FB_DEV, NODE_DEV, NODE_PROD], moduleType: RENDERER, entry: 'react-test-renderer/shallow', @@ -180,7 +180,7 @@ const bundles = [ /******* React Noop Renderer (used only for fixtures/fiber-debugger) *******/ { - label: 'noop-fiber', + label: 'noop', bundleTypes: [NODE_DEV], moduleType: RENDERER, entry: 'react-noop-renderer', From 3499f38b5cf795fb2f8eaf3367bb14ccc42ea6db Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 25 Oct 2017 00:18:50 +0100 Subject: [PATCH 27/29] Get rid of output option by introducing react-dom/server.node --- packages/react-dom/npm/server.js | 6 +----- packages/react-dom/npm/server.node.js | 7 +++++++ packages/react-dom/package.json | 1 + packages/react-dom/server.js | 2 +- packages/react-dom/server.node.js | 12 ++++++++++++ scripts/rollup/build.js | 6 +----- scripts/rollup/bundles.js | 3 +-- scripts/rollup/results.json | 4 ++-- 8 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 packages/react-dom/npm/server.node.js create mode 100644 packages/react-dom/server.node.js diff --git a/packages/react-dom/npm/server.js b/packages/react-dom/npm/server.js index c45c37af6f37..02f1553990a2 100644 --- a/packages/react-dom/npm/server.js +++ b/packages/react-dom/npm/server.js @@ -1,7 +1,3 @@ 'use strict'; -if (process.env.NODE_ENV === 'production') { - module.exports = require('./cjs/react-dom-server.node.production.min.js'); -} else { - module.exports = require('./cjs/react-dom-server.node.development.js'); -} +module.exports = require('./server.node'); diff --git a/packages/react-dom/npm/server.node.js b/packages/react-dom/npm/server.node.js new file mode 100644 index 000000000000..c45c37af6f37 --- /dev/null +++ b/packages/react-dom/npm/server.node.js @@ -0,0 +1,7 @@ +'use strict'; + +if (process.env.NODE_ENV === 'production') { + module.exports = require('./cjs/react-dom-server.node.production.min.js'); +} else { + module.exports = require('./cjs/react-dom-server.node.development.js'); +} diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json index e7e97ff5707f..d6e108610642 100644 --- a/packages/react-dom/package.json +++ b/packages/react-dom/package.json @@ -27,6 +27,7 @@ "index.js", "server.js", "server.browser.js", + "server.node.js", "test-utils.js", "unstable-native-dependencies.js", "cjs/", diff --git a/packages/react-dom/server.js b/packages/react-dom/server.js index 27cd64e7ce9e..d05bb1380e0f 100644 --- a/packages/react-dom/server.js +++ b/packages/react-dom/server.js @@ -9,4 +9,4 @@ 'use strict'; -module.exports = require('./src/server/ReactDOMServerNode'); +module.exports = require('./server.node'); diff --git a/packages/react-dom/server.node.js b/packages/react-dom/server.node.js new file mode 100644 index 000000000000..27cd64e7ce9e --- /dev/null +++ b/packages/react-dom/server.node.js @@ -0,0 +1,12 @@ +/** + * Copyright (c) 2013-present, Facebook, Inc. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @flow + */ + +'use strict'; + +module.exports = require('./src/server/ReactDOMServerNode'); diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js index 62db4b44186f..85736ca44435 100644 --- a/scripts/rollup/build.js +++ b/scripts/rollup/build.js @@ -507,11 +507,7 @@ function createBundle(bundle, bundleType) { } } - const filename = getFilename( - bundle.output || bundle.entry, - bundle.global, - bundleType - ); + const filename = getFilename(bundle.entry, bundle.global, bundleType); const logKey = chalk.white.bold(filename) + chalk.dim(` (${bundleType.toLowerCase()})`); const format = getFormat(bundleType); diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 754559cfaa67..d6445c15f07f 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -91,8 +91,7 @@ const bundles = [ label: 'dom-server-node', bundleTypes: [NODE_DEV, NODE_PROD], moduleType: RENDERER, - entry: 'react-dom/server', - output: 'react-dom/server.node', + entry: 'react-dom/server.node', externals: ['react', 'stream'], }, diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json index fd7f2080da2d..acb588ad4c8a 100644 --- a/scripts/rollup/results.json +++ b/scripts/rollup/results.json @@ -109,8 +109,8 @@ "gzip": 11846 }, "react-dom-server.node.development.js (NODE_DEV)": { - "size": 96729, - "gzip": 25627 + "size": 96739, + "gzip": 25630 }, "react-dom-server.node.production.min.js (NODE_PROD)": { "size": 15988, From 7aae950d0c6b295354514f687ace486d3397059a Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 25 Oct 2017 00:40:28 +0100 Subject: [PATCH 28/29] Reconciler should depend on prop-types --- packages/react-reconciler/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/react-reconciler/package.json b/packages/react-reconciler/package.json index 1432bb2ee687..f3fccf1774aa 100644 --- a/packages/react-reconciler/package.json +++ b/packages/react-reconciler/package.json @@ -25,7 +25,8 @@ "dependencies": { "fbjs": "^0.8.16", "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" + "object-assign": "^4.1.1", + "prop-types": "^15.6.0" }, "browserify": { "transform": [ From 5179733df32a395d0e635573fab0c8c0ea7f014b Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 25 Oct 2017 00:51:23 +0100 Subject: [PATCH 29/29] Update sizes last time --- scripts/rollup/results.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json index acb588ad4c8a..af0d587ac79b 100644 --- a/scripts/rollup/results.json +++ b/scripts/rollup/results.json @@ -193,8 +193,8 @@ "gzip": 60806 }, "react-reconciler.development.js (NODE_DEV)": { - "size": 281633, - "gzip": 58459 + "size": 278819, + "gzip": 57593 }, "react-reconciler.production.min.js (NODE_PROD)": { "size": 38245,