From 98272f486789b7f475dfdbc3b7e80e4dd47ec8f4 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 19:56:12 +0100 Subject: [PATCH 1/3] Flatten everything --- packages/{shared/event => events}/BrowserEventConstants.js | 0 packages/{shared/event => events}/EventPluginHub.js | 0 packages/{shared/event => events}/EventPluginRegistry.js | 0 packages/{shared/event => events}/EventPluginUtils.js | 0 packages/{shared/event => events}/EventPropagators.js | 0 packages/{shared/event => events}/PluginModuleType.js | 0 .../{shared/event => events}/ReactControlledComponent.js | 0 .../{shared/event => events}/ReactEventEmitterMixin.js | 0 packages/{shared/event => events}/ReactGenericBatching.js | 0 .../{shared/event => events}/ReactSyntheticEventType.js | 0 .../event/plugins => events}/ResponderEventPlugin.js | 0 .../event/plugins => events}/ResponderSyntheticEvent.js | 0 .../event/plugins => events}/ResponderTouchHistoryStore.js | 0 packages/{shared/event => events}/SyntheticEvent.js | 0 .../{shared/event/plugins => events}/TouchHistoryMath.js | 0 .../event => events}/__tests__/EventPluginRegistry-test.js | 0 .../__tests__/ResponderEventPlugin-test.js | 0 .../event => events}/__tests__/accumulateInto-test.js | 0 packages/{shared/event => events}/accumulate.js | 0 packages/{shared/event => events}/accumulateInto.js | 0 packages/{shared/event => events}/forEachAccumulated.js | 0 .../{shared/event => events}/getVendorPrefixedEventName.js | 0 .../event/plugins => events}/BeforeInputEventPlugin.js | 0 .../{client/event/plugins => events}/ChangeEventPlugin.js | 0 .../event/plugins => events}/DOMEventPluginOrder.js | 0 .../event/plugins => events}/EnterLeaveEventPlugin.js | 0 .../event/plugins => events}/FallbackCompositionState.js | 0 .../{client/event => events}/ReactBrowserEventEmitter.js | 0 .../src/{client/event => events}/ReactDOMEventListener.js | 0 .../{client/event/plugins => events}/SelectEventPlugin.js | 0 .../{client/event/plugins => events}/SimpleEventPlugin.js | 0 .../{client/event => events}/SyntheticAnimationEvent.js | 0 .../{client/event => events}/SyntheticClipboardEvent.js | 0 .../{client/event => events}/SyntheticCompositionEvent.js | 0 .../src/{client/event => events}/SyntheticDragEvent.js | 0 .../src/{client/event => events}/SyntheticFocusEvent.js | 0 .../src/{client/event => events}/SyntheticInputEvent.js | 0 .../src/{client/event => events}/SyntheticKeyboardEvent.js | 0 .../src/{client/event => events}/SyntheticMouseEvent.js | 0 .../src/{client/event => events}/SyntheticTouchEvent.js | 0 .../{client/event => events}/SyntheticTransitionEvent.js | 0 .../src/{client/event => events}/SyntheticUIEvent.js | 0 .../src/{client/event => events}/SyntheticWheelEvent.js | 0 .../src/{client/event/plugins => events}/TapEventPlugin.js | 0 .../__tests__/BeforeInputEventPlugin-test.js | 0 .../plugins => events}/__tests__/ChangeEventPlugin-test.js | 0 .../__tests__/EnterLeaveEventPlugin-test.js | 0 .../__tests__/FallbackCompositionState-test.js | 0 .../plugins => events}/__tests__/SelectEventPlugin-test.js | 0 .../plugins => events}/__tests__/SimpleEventPlugin-test.js | 0 .../__tests__/SyntheticClipboardEvent-test.js | 0 .../event => events}/__tests__/SyntheticEvent-test.js | 0 .../__tests__/SyntheticKeyboardEvent-test.js | 0 .../event => events}/__tests__/SyntheticWheelEvent-test.js | 0 .../event => events}/__tests__/getEventCharCode-test.js | 0 .../{client/event => events}/__tests__/getEventKey-test.js | 0 .../src/{client/event => events}/getEventCharCode.js | 0 .../react-dom/src/{client/event => events}/getEventKey.js | 0 .../src/{client/event => events}/getEventModifierState.js | 0 .../src/{client/event => events}/getEventTarget.js | 0 .../src/{client/event => events}/isEventSupported.js | 0 .../src/{isomorphic => }/ReactCoroutine.js | 0 .../react-reconciler/src/{isomorphic => }/ReactPortal.js | 0 .../react-reconciler/src/{isomorphic => }/ReactTypes.js | 0 packages/react/src/{class => }/ReactBaseClasses.js | 0 packages/react/src/{children => }/ReactChildren.js | 0 packages/react/src/{element => }/ReactCurrentOwner.js | 0 packages/react/src/{element => }/ReactDebugCurrentFrame.js | 0 packages/react/src/{element => }/ReactElement.js | 0 packages/react/src/{element => }/ReactElementValidator.js | 0 packages/react/src/{class => }/ReactNoopUpdateQueue.js | 0 .../src/{children => }/__tests__/ReactChildren-test.js | 0 .../{class => }/__tests__/ReactClassEquivalence-test.js | 0 .../__tests__/ReactCoffeeScriptClass-test.coffee | 0 .../react/src/{class => }/__tests__/ReactES6Class-test.js | 0 .../react/src/{element => }/__tests__/ReactElement-test.js | 0 .../src/{element => }/__tests__/ReactElementClone-test.js | 0 .../{element => }/__tests__/ReactElementValidator-test.js | 0 .../src/{element => }/__tests__/ReactJSXElement-test.js | 0 .../__tests__/ReactJSXElementValidator-test.js | 0 .../src/{class => }/__tests__/ReactPureComponent-test.js | 0 .../src/{class => }/__tests__/ReactTypeScriptClass-test.ts | 0 .../react/src/{children => }/__tests__/onlyChild-test.js | 0 .../{class => }/__tests__/testDefinitions/PropTypes.d.ts | 0 .../src/{class => }/__tests__/testDefinitions/React.d.ts | 0 .../{class => }/__tests__/testDefinitions/ReactDOM.d.ts | 0 packages/react/src/{children => }/onlyChild.js | 0 scripts/rollup/bundles.js | 7 +++++++ scripts/rollup/packaging.js | 4 ++-- 89 files changed, 9 insertions(+), 2 deletions(-) rename packages/{shared/event => events}/BrowserEventConstants.js (100%) rename packages/{shared/event => events}/EventPluginHub.js (100%) rename packages/{shared/event => events}/EventPluginRegistry.js (100%) rename packages/{shared/event => events}/EventPluginUtils.js (100%) rename packages/{shared/event => events}/EventPropagators.js (100%) rename packages/{shared/event => events}/PluginModuleType.js (100%) rename packages/{shared/event => events}/ReactControlledComponent.js (100%) rename packages/{shared/event => events}/ReactEventEmitterMixin.js (100%) rename packages/{shared/event => events}/ReactGenericBatching.js (100%) rename packages/{shared/event => events}/ReactSyntheticEventType.js (100%) rename packages/{shared/event/plugins => events}/ResponderEventPlugin.js (100%) rename packages/{shared/event/plugins => events}/ResponderSyntheticEvent.js (100%) rename packages/{shared/event/plugins => events}/ResponderTouchHistoryStore.js (100%) rename packages/{shared/event => events}/SyntheticEvent.js (100%) rename packages/{shared/event/plugins => events}/TouchHistoryMath.js (100%) rename packages/{shared/event => events}/__tests__/EventPluginRegistry-test.js (100%) rename packages/{shared/event/plugins => events}/__tests__/ResponderEventPlugin-test.js (100%) rename packages/{shared/event => events}/__tests__/accumulateInto-test.js (100%) rename packages/{shared/event => events}/accumulate.js (100%) rename packages/{shared/event => events}/accumulateInto.js (100%) rename packages/{shared/event => events}/forEachAccumulated.js (100%) rename packages/{shared/event => events}/getVendorPrefixedEventName.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/BeforeInputEventPlugin.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/ChangeEventPlugin.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/DOMEventPluginOrder.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/EnterLeaveEventPlugin.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/FallbackCompositionState.js (100%) rename packages/react-dom/src/{client/event => events}/ReactBrowserEventEmitter.js (100%) rename packages/react-dom/src/{client/event => events}/ReactDOMEventListener.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/SelectEventPlugin.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/SimpleEventPlugin.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticAnimationEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticClipboardEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticCompositionEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticDragEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticFocusEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticInputEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticKeyboardEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticMouseEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticTouchEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticTransitionEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticUIEvent.js (100%) rename packages/react-dom/src/{client/event => events}/SyntheticWheelEvent.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/TapEventPlugin.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/__tests__/BeforeInputEventPlugin-test.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/__tests__/ChangeEventPlugin-test.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/__tests__/EnterLeaveEventPlugin-test.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/__tests__/FallbackCompositionState-test.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/__tests__/SelectEventPlugin-test.js (100%) rename packages/react-dom/src/{client/event/plugins => events}/__tests__/SimpleEventPlugin-test.js (100%) rename packages/react-dom/src/{client/event => events}/__tests__/SyntheticClipboardEvent-test.js (100%) rename packages/react-dom/src/{client/event => events}/__tests__/SyntheticEvent-test.js (100%) rename packages/react-dom/src/{client/event => events}/__tests__/SyntheticKeyboardEvent-test.js (100%) rename packages/react-dom/src/{client/event => events}/__tests__/SyntheticWheelEvent-test.js (100%) rename packages/react-dom/src/{client/event => events}/__tests__/getEventCharCode-test.js (100%) rename packages/react-dom/src/{client/event => events}/__tests__/getEventKey-test.js (100%) rename packages/react-dom/src/{client/event => events}/getEventCharCode.js (100%) rename packages/react-dom/src/{client/event => events}/getEventKey.js (100%) rename packages/react-dom/src/{client/event => events}/getEventModifierState.js (100%) rename packages/react-dom/src/{client/event => events}/getEventTarget.js (100%) rename packages/react-dom/src/{client/event => events}/isEventSupported.js (100%) rename packages/react-reconciler/src/{isomorphic => }/ReactCoroutine.js (100%) rename packages/react-reconciler/src/{isomorphic => }/ReactPortal.js (100%) rename packages/react-reconciler/src/{isomorphic => }/ReactTypes.js (100%) rename packages/react/src/{class => }/ReactBaseClasses.js (100%) rename packages/react/src/{children => }/ReactChildren.js (100%) rename packages/react/src/{element => }/ReactCurrentOwner.js (100%) rename packages/react/src/{element => }/ReactDebugCurrentFrame.js (100%) rename packages/react/src/{element => }/ReactElement.js (100%) rename packages/react/src/{element => }/ReactElementValidator.js (100%) rename packages/react/src/{class => }/ReactNoopUpdateQueue.js (100%) rename packages/react/src/{children => }/__tests__/ReactChildren-test.js (100%) rename packages/react/src/{class => }/__tests__/ReactClassEquivalence-test.js (100%) rename packages/react/src/{class => }/__tests__/ReactCoffeeScriptClass-test.coffee (100%) rename packages/react/src/{class => }/__tests__/ReactES6Class-test.js (100%) rename packages/react/src/{element => }/__tests__/ReactElement-test.js (100%) rename packages/react/src/{element => }/__tests__/ReactElementClone-test.js (100%) rename packages/react/src/{element => }/__tests__/ReactElementValidator-test.js (100%) rename packages/react/src/{element => }/__tests__/ReactJSXElement-test.js (100%) rename packages/react/src/{element => }/__tests__/ReactJSXElementValidator-test.js (100%) rename packages/react/src/{class => }/__tests__/ReactPureComponent-test.js (100%) rename packages/react/src/{class => }/__tests__/ReactTypeScriptClass-test.ts (100%) rename packages/react/src/{children => }/__tests__/onlyChild-test.js (100%) rename packages/react/src/{class => }/__tests__/testDefinitions/PropTypes.d.ts (100%) rename packages/react/src/{class => }/__tests__/testDefinitions/React.d.ts (100%) rename packages/react/src/{class => }/__tests__/testDefinitions/ReactDOM.d.ts (100%) rename packages/react/src/{children => }/onlyChild.js (100%) diff --git a/packages/shared/event/BrowserEventConstants.js b/packages/events/BrowserEventConstants.js similarity index 100% rename from packages/shared/event/BrowserEventConstants.js rename to packages/events/BrowserEventConstants.js diff --git a/packages/shared/event/EventPluginHub.js b/packages/events/EventPluginHub.js similarity index 100% rename from packages/shared/event/EventPluginHub.js rename to packages/events/EventPluginHub.js diff --git a/packages/shared/event/EventPluginRegistry.js b/packages/events/EventPluginRegistry.js similarity index 100% rename from packages/shared/event/EventPluginRegistry.js rename to packages/events/EventPluginRegistry.js diff --git a/packages/shared/event/EventPluginUtils.js b/packages/events/EventPluginUtils.js similarity index 100% rename from packages/shared/event/EventPluginUtils.js rename to packages/events/EventPluginUtils.js diff --git a/packages/shared/event/EventPropagators.js b/packages/events/EventPropagators.js similarity index 100% rename from packages/shared/event/EventPropagators.js rename to packages/events/EventPropagators.js diff --git a/packages/shared/event/PluginModuleType.js b/packages/events/PluginModuleType.js similarity index 100% rename from packages/shared/event/PluginModuleType.js rename to packages/events/PluginModuleType.js diff --git a/packages/shared/event/ReactControlledComponent.js b/packages/events/ReactControlledComponent.js similarity index 100% rename from packages/shared/event/ReactControlledComponent.js rename to packages/events/ReactControlledComponent.js diff --git a/packages/shared/event/ReactEventEmitterMixin.js b/packages/events/ReactEventEmitterMixin.js similarity index 100% rename from packages/shared/event/ReactEventEmitterMixin.js rename to packages/events/ReactEventEmitterMixin.js diff --git a/packages/shared/event/ReactGenericBatching.js b/packages/events/ReactGenericBatching.js similarity index 100% rename from packages/shared/event/ReactGenericBatching.js rename to packages/events/ReactGenericBatching.js diff --git a/packages/shared/event/ReactSyntheticEventType.js b/packages/events/ReactSyntheticEventType.js similarity index 100% rename from packages/shared/event/ReactSyntheticEventType.js rename to packages/events/ReactSyntheticEventType.js diff --git a/packages/shared/event/plugins/ResponderEventPlugin.js b/packages/events/ResponderEventPlugin.js similarity index 100% rename from packages/shared/event/plugins/ResponderEventPlugin.js rename to packages/events/ResponderEventPlugin.js diff --git a/packages/shared/event/plugins/ResponderSyntheticEvent.js b/packages/events/ResponderSyntheticEvent.js similarity index 100% rename from packages/shared/event/plugins/ResponderSyntheticEvent.js rename to packages/events/ResponderSyntheticEvent.js diff --git a/packages/shared/event/plugins/ResponderTouchHistoryStore.js b/packages/events/ResponderTouchHistoryStore.js similarity index 100% rename from packages/shared/event/plugins/ResponderTouchHistoryStore.js rename to packages/events/ResponderTouchHistoryStore.js diff --git a/packages/shared/event/SyntheticEvent.js b/packages/events/SyntheticEvent.js similarity index 100% rename from packages/shared/event/SyntheticEvent.js rename to packages/events/SyntheticEvent.js diff --git a/packages/shared/event/plugins/TouchHistoryMath.js b/packages/events/TouchHistoryMath.js similarity index 100% rename from packages/shared/event/plugins/TouchHistoryMath.js rename to packages/events/TouchHistoryMath.js diff --git a/packages/shared/event/__tests__/EventPluginRegistry-test.js b/packages/events/__tests__/EventPluginRegistry-test.js similarity index 100% rename from packages/shared/event/__tests__/EventPluginRegistry-test.js rename to packages/events/__tests__/EventPluginRegistry-test.js diff --git a/packages/shared/event/plugins/__tests__/ResponderEventPlugin-test.js b/packages/events/__tests__/ResponderEventPlugin-test.js similarity index 100% rename from packages/shared/event/plugins/__tests__/ResponderEventPlugin-test.js rename to packages/events/__tests__/ResponderEventPlugin-test.js diff --git a/packages/shared/event/__tests__/accumulateInto-test.js b/packages/events/__tests__/accumulateInto-test.js similarity index 100% rename from packages/shared/event/__tests__/accumulateInto-test.js rename to packages/events/__tests__/accumulateInto-test.js diff --git a/packages/shared/event/accumulate.js b/packages/events/accumulate.js similarity index 100% rename from packages/shared/event/accumulate.js rename to packages/events/accumulate.js diff --git a/packages/shared/event/accumulateInto.js b/packages/events/accumulateInto.js similarity index 100% rename from packages/shared/event/accumulateInto.js rename to packages/events/accumulateInto.js diff --git a/packages/shared/event/forEachAccumulated.js b/packages/events/forEachAccumulated.js similarity index 100% rename from packages/shared/event/forEachAccumulated.js rename to packages/events/forEachAccumulated.js diff --git a/packages/shared/event/getVendorPrefixedEventName.js b/packages/events/getVendorPrefixedEventName.js similarity index 100% rename from packages/shared/event/getVendorPrefixedEventName.js rename to packages/events/getVendorPrefixedEventName.js diff --git a/packages/react-dom/src/client/event/plugins/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/BeforeInputEventPlugin.js rename to packages/react-dom/src/events/BeforeInputEventPlugin.js diff --git a/packages/react-dom/src/client/event/plugins/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/ChangeEventPlugin.js rename to packages/react-dom/src/events/ChangeEventPlugin.js diff --git a/packages/react-dom/src/client/event/plugins/DOMEventPluginOrder.js b/packages/react-dom/src/events/DOMEventPluginOrder.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/DOMEventPluginOrder.js rename to packages/react-dom/src/events/DOMEventPluginOrder.js diff --git a/packages/react-dom/src/client/event/plugins/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/EnterLeaveEventPlugin.js rename to packages/react-dom/src/events/EnterLeaveEventPlugin.js diff --git a/packages/react-dom/src/client/event/plugins/FallbackCompositionState.js b/packages/react-dom/src/events/FallbackCompositionState.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/FallbackCompositionState.js rename to packages/react-dom/src/events/FallbackCompositionState.js diff --git a/packages/react-dom/src/client/event/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js similarity index 100% rename from packages/react-dom/src/client/event/ReactBrowserEventEmitter.js rename to packages/react-dom/src/events/ReactBrowserEventEmitter.js diff --git a/packages/react-dom/src/client/event/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js similarity index 100% rename from packages/react-dom/src/client/event/ReactDOMEventListener.js rename to packages/react-dom/src/events/ReactDOMEventListener.js diff --git a/packages/react-dom/src/client/event/plugins/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/SelectEventPlugin.js rename to packages/react-dom/src/events/SelectEventPlugin.js diff --git a/packages/react-dom/src/client/event/plugins/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/SimpleEventPlugin.js rename to packages/react-dom/src/events/SimpleEventPlugin.js diff --git a/packages/react-dom/src/client/event/SyntheticAnimationEvent.js b/packages/react-dom/src/events/SyntheticAnimationEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticAnimationEvent.js rename to packages/react-dom/src/events/SyntheticAnimationEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticClipboardEvent.js b/packages/react-dom/src/events/SyntheticClipboardEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticClipboardEvent.js rename to packages/react-dom/src/events/SyntheticClipboardEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticCompositionEvent.js b/packages/react-dom/src/events/SyntheticCompositionEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticCompositionEvent.js rename to packages/react-dom/src/events/SyntheticCompositionEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticDragEvent.js b/packages/react-dom/src/events/SyntheticDragEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticDragEvent.js rename to packages/react-dom/src/events/SyntheticDragEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticFocusEvent.js b/packages/react-dom/src/events/SyntheticFocusEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticFocusEvent.js rename to packages/react-dom/src/events/SyntheticFocusEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticInputEvent.js b/packages/react-dom/src/events/SyntheticInputEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticInputEvent.js rename to packages/react-dom/src/events/SyntheticInputEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticKeyboardEvent.js b/packages/react-dom/src/events/SyntheticKeyboardEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticKeyboardEvent.js rename to packages/react-dom/src/events/SyntheticKeyboardEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticMouseEvent.js b/packages/react-dom/src/events/SyntheticMouseEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticMouseEvent.js rename to packages/react-dom/src/events/SyntheticMouseEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticTouchEvent.js b/packages/react-dom/src/events/SyntheticTouchEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticTouchEvent.js rename to packages/react-dom/src/events/SyntheticTouchEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticTransitionEvent.js b/packages/react-dom/src/events/SyntheticTransitionEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticTransitionEvent.js rename to packages/react-dom/src/events/SyntheticTransitionEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticUIEvent.js b/packages/react-dom/src/events/SyntheticUIEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticUIEvent.js rename to packages/react-dom/src/events/SyntheticUIEvent.js diff --git a/packages/react-dom/src/client/event/SyntheticWheelEvent.js b/packages/react-dom/src/events/SyntheticWheelEvent.js similarity index 100% rename from packages/react-dom/src/client/event/SyntheticWheelEvent.js rename to packages/react-dom/src/events/SyntheticWheelEvent.js diff --git a/packages/react-dom/src/client/event/plugins/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/TapEventPlugin.js rename to packages/react-dom/src/events/TapEventPlugin.js diff --git a/packages/react-dom/src/client/event/plugins/__tests__/BeforeInputEventPlugin-test.js b/packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/__tests__/BeforeInputEventPlugin-test.js rename to packages/react-dom/src/events/__tests__/BeforeInputEventPlugin-test.js diff --git a/packages/react-dom/src/client/event/plugins/__tests__/ChangeEventPlugin-test.js b/packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/__tests__/ChangeEventPlugin-test.js rename to packages/react-dom/src/events/__tests__/ChangeEventPlugin-test.js diff --git a/packages/react-dom/src/client/event/plugins/__tests__/EnterLeaveEventPlugin-test.js b/packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/__tests__/EnterLeaveEventPlugin-test.js rename to packages/react-dom/src/events/__tests__/EnterLeaveEventPlugin-test.js diff --git a/packages/react-dom/src/client/event/plugins/__tests__/FallbackCompositionState-test.js b/packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/__tests__/FallbackCompositionState-test.js rename to packages/react-dom/src/events/__tests__/FallbackCompositionState-test.js diff --git a/packages/react-dom/src/client/event/plugins/__tests__/SelectEventPlugin-test.js b/packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/__tests__/SelectEventPlugin-test.js rename to packages/react-dom/src/events/__tests__/SelectEventPlugin-test.js diff --git a/packages/react-dom/src/client/event/plugins/__tests__/SimpleEventPlugin-test.js b/packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.js similarity index 100% rename from packages/react-dom/src/client/event/plugins/__tests__/SimpleEventPlugin-test.js rename to packages/react-dom/src/events/__tests__/SimpleEventPlugin-test.js diff --git a/packages/react-dom/src/client/event/__tests__/SyntheticClipboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js similarity index 100% rename from packages/react-dom/src/client/event/__tests__/SyntheticClipboardEvent-test.js rename to packages/react-dom/src/events/__tests__/SyntheticClipboardEvent-test.js diff --git a/packages/react-dom/src/client/event/__tests__/SyntheticEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticEvent-test.js similarity index 100% rename from packages/react-dom/src/client/event/__tests__/SyntheticEvent-test.js rename to packages/react-dom/src/events/__tests__/SyntheticEvent-test.js diff --git a/packages/react-dom/src/client/event/__tests__/SyntheticKeyboardEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js similarity index 100% rename from packages/react-dom/src/client/event/__tests__/SyntheticKeyboardEvent-test.js rename to packages/react-dom/src/events/__tests__/SyntheticKeyboardEvent-test.js diff --git a/packages/react-dom/src/client/event/__tests__/SyntheticWheelEvent-test.js b/packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js similarity index 100% rename from packages/react-dom/src/client/event/__tests__/SyntheticWheelEvent-test.js rename to packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js diff --git a/packages/react-dom/src/client/event/__tests__/getEventCharCode-test.js b/packages/react-dom/src/events/__tests__/getEventCharCode-test.js similarity index 100% rename from packages/react-dom/src/client/event/__tests__/getEventCharCode-test.js rename to packages/react-dom/src/events/__tests__/getEventCharCode-test.js diff --git a/packages/react-dom/src/client/event/__tests__/getEventKey-test.js b/packages/react-dom/src/events/__tests__/getEventKey-test.js similarity index 100% rename from packages/react-dom/src/client/event/__tests__/getEventKey-test.js rename to packages/react-dom/src/events/__tests__/getEventKey-test.js diff --git a/packages/react-dom/src/client/event/getEventCharCode.js b/packages/react-dom/src/events/getEventCharCode.js similarity index 100% rename from packages/react-dom/src/client/event/getEventCharCode.js rename to packages/react-dom/src/events/getEventCharCode.js diff --git a/packages/react-dom/src/client/event/getEventKey.js b/packages/react-dom/src/events/getEventKey.js similarity index 100% rename from packages/react-dom/src/client/event/getEventKey.js rename to packages/react-dom/src/events/getEventKey.js diff --git a/packages/react-dom/src/client/event/getEventModifierState.js b/packages/react-dom/src/events/getEventModifierState.js similarity index 100% rename from packages/react-dom/src/client/event/getEventModifierState.js rename to packages/react-dom/src/events/getEventModifierState.js diff --git a/packages/react-dom/src/client/event/getEventTarget.js b/packages/react-dom/src/events/getEventTarget.js similarity index 100% rename from packages/react-dom/src/client/event/getEventTarget.js rename to packages/react-dom/src/events/getEventTarget.js diff --git a/packages/react-dom/src/client/event/isEventSupported.js b/packages/react-dom/src/events/isEventSupported.js similarity index 100% rename from packages/react-dom/src/client/event/isEventSupported.js rename to packages/react-dom/src/events/isEventSupported.js diff --git a/packages/react-reconciler/src/isomorphic/ReactCoroutine.js b/packages/react-reconciler/src/ReactCoroutine.js similarity index 100% rename from packages/react-reconciler/src/isomorphic/ReactCoroutine.js rename to packages/react-reconciler/src/ReactCoroutine.js diff --git a/packages/react-reconciler/src/isomorphic/ReactPortal.js b/packages/react-reconciler/src/ReactPortal.js similarity index 100% rename from packages/react-reconciler/src/isomorphic/ReactPortal.js rename to packages/react-reconciler/src/ReactPortal.js diff --git a/packages/react-reconciler/src/isomorphic/ReactTypes.js b/packages/react-reconciler/src/ReactTypes.js similarity index 100% rename from packages/react-reconciler/src/isomorphic/ReactTypes.js rename to packages/react-reconciler/src/ReactTypes.js diff --git a/packages/react/src/class/ReactBaseClasses.js b/packages/react/src/ReactBaseClasses.js similarity index 100% rename from packages/react/src/class/ReactBaseClasses.js rename to packages/react/src/ReactBaseClasses.js diff --git a/packages/react/src/children/ReactChildren.js b/packages/react/src/ReactChildren.js similarity index 100% rename from packages/react/src/children/ReactChildren.js rename to packages/react/src/ReactChildren.js diff --git a/packages/react/src/element/ReactCurrentOwner.js b/packages/react/src/ReactCurrentOwner.js similarity index 100% rename from packages/react/src/element/ReactCurrentOwner.js rename to packages/react/src/ReactCurrentOwner.js diff --git a/packages/react/src/element/ReactDebugCurrentFrame.js b/packages/react/src/ReactDebugCurrentFrame.js similarity index 100% rename from packages/react/src/element/ReactDebugCurrentFrame.js rename to packages/react/src/ReactDebugCurrentFrame.js diff --git a/packages/react/src/element/ReactElement.js b/packages/react/src/ReactElement.js similarity index 100% rename from packages/react/src/element/ReactElement.js rename to packages/react/src/ReactElement.js diff --git a/packages/react/src/element/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js similarity index 100% rename from packages/react/src/element/ReactElementValidator.js rename to packages/react/src/ReactElementValidator.js diff --git a/packages/react/src/class/ReactNoopUpdateQueue.js b/packages/react/src/ReactNoopUpdateQueue.js similarity index 100% rename from packages/react/src/class/ReactNoopUpdateQueue.js rename to packages/react/src/ReactNoopUpdateQueue.js diff --git a/packages/react/src/children/__tests__/ReactChildren-test.js b/packages/react/src/__tests__/ReactChildren-test.js similarity index 100% rename from packages/react/src/children/__tests__/ReactChildren-test.js rename to packages/react/src/__tests__/ReactChildren-test.js diff --git a/packages/react/src/class/__tests__/ReactClassEquivalence-test.js b/packages/react/src/__tests__/ReactClassEquivalence-test.js similarity index 100% rename from packages/react/src/class/__tests__/ReactClassEquivalence-test.js rename to packages/react/src/__tests__/ReactClassEquivalence-test.js diff --git a/packages/react/src/class/__tests__/ReactCoffeeScriptClass-test.coffee b/packages/react/src/__tests__/ReactCoffeeScriptClass-test.coffee similarity index 100% rename from packages/react/src/class/__tests__/ReactCoffeeScriptClass-test.coffee rename to packages/react/src/__tests__/ReactCoffeeScriptClass-test.coffee diff --git a/packages/react/src/class/__tests__/ReactES6Class-test.js b/packages/react/src/__tests__/ReactES6Class-test.js similarity index 100% rename from packages/react/src/class/__tests__/ReactES6Class-test.js rename to packages/react/src/__tests__/ReactES6Class-test.js diff --git a/packages/react/src/element/__tests__/ReactElement-test.js b/packages/react/src/__tests__/ReactElement-test.js similarity index 100% rename from packages/react/src/element/__tests__/ReactElement-test.js rename to packages/react/src/__tests__/ReactElement-test.js diff --git a/packages/react/src/element/__tests__/ReactElementClone-test.js b/packages/react/src/__tests__/ReactElementClone-test.js similarity index 100% rename from packages/react/src/element/__tests__/ReactElementClone-test.js rename to packages/react/src/__tests__/ReactElementClone-test.js diff --git a/packages/react/src/element/__tests__/ReactElementValidator-test.js b/packages/react/src/__tests__/ReactElementValidator-test.js similarity index 100% rename from packages/react/src/element/__tests__/ReactElementValidator-test.js rename to packages/react/src/__tests__/ReactElementValidator-test.js diff --git a/packages/react/src/element/__tests__/ReactJSXElement-test.js b/packages/react/src/__tests__/ReactJSXElement-test.js similarity index 100% rename from packages/react/src/element/__tests__/ReactJSXElement-test.js rename to packages/react/src/__tests__/ReactJSXElement-test.js diff --git a/packages/react/src/element/__tests__/ReactJSXElementValidator-test.js b/packages/react/src/__tests__/ReactJSXElementValidator-test.js similarity index 100% rename from packages/react/src/element/__tests__/ReactJSXElementValidator-test.js rename to packages/react/src/__tests__/ReactJSXElementValidator-test.js diff --git a/packages/react/src/class/__tests__/ReactPureComponent-test.js b/packages/react/src/__tests__/ReactPureComponent-test.js similarity index 100% rename from packages/react/src/class/__tests__/ReactPureComponent-test.js rename to packages/react/src/__tests__/ReactPureComponent-test.js diff --git a/packages/react/src/class/__tests__/ReactTypeScriptClass-test.ts b/packages/react/src/__tests__/ReactTypeScriptClass-test.ts similarity index 100% rename from packages/react/src/class/__tests__/ReactTypeScriptClass-test.ts rename to packages/react/src/__tests__/ReactTypeScriptClass-test.ts diff --git a/packages/react/src/children/__tests__/onlyChild-test.js b/packages/react/src/__tests__/onlyChild-test.js similarity index 100% rename from packages/react/src/children/__tests__/onlyChild-test.js rename to packages/react/src/__tests__/onlyChild-test.js diff --git a/packages/react/src/class/__tests__/testDefinitions/PropTypes.d.ts b/packages/react/src/__tests__/testDefinitions/PropTypes.d.ts similarity index 100% rename from packages/react/src/class/__tests__/testDefinitions/PropTypes.d.ts rename to packages/react/src/__tests__/testDefinitions/PropTypes.d.ts diff --git a/packages/react/src/class/__tests__/testDefinitions/React.d.ts b/packages/react/src/__tests__/testDefinitions/React.d.ts similarity index 100% rename from packages/react/src/class/__tests__/testDefinitions/React.d.ts rename to packages/react/src/__tests__/testDefinitions/React.d.ts diff --git a/packages/react/src/class/__tests__/testDefinitions/ReactDOM.d.ts b/packages/react/src/__tests__/testDefinitions/ReactDOM.d.ts similarity index 100% rename from packages/react/src/class/__tests__/testDefinitions/ReactDOM.d.ts rename to packages/react/src/__tests__/testDefinitions/ReactDOM.d.ts diff --git a/packages/react/src/children/onlyChild.js b/packages/react/src/onlyChild.js similarity index 100% rename from packages/react/src/children/onlyChild.js rename to packages/react/src/onlyChild.js diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 8677cd1a909d9..e6b4bc9d4f3a4 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -95,8 +95,10 @@ const bundles = [ 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', @@ -127,7 +129,9 @@ const bundles = [ 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', @@ -160,6 +164,7 @@ const bundles = [ 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', @@ -188,6 +193,7 @@ const bundles = [ 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', @@ -366,6 +372,7 @@ const bundles = [ manglePropertiesOnProd: false, name: 'react-test-renderer', paths: [ + 'packages/events/**/*.js', 'packages/react-test-renderer/**/*.js', 'packages/react-reconciler/**/*.js', 'packages/shared/**/*.js', diff --git a/scripts/rollup/packaging.js b/scripts/rollup/packaging.js index 6340fd0771b77..fa6db765b0e86 100644 --- a/scripts/rollup/packaging.js +++ b/scripts/rollup/packaging.js @@ -19,12 +19,12 @@ const RN_PROD = Bundles.bundleTypes.RN_PROD; const facebookWWW = 'facebook-www'; // these files need to be copied to the facebook-www build const facebookWWWSrcDependencies = [ - 'packages/react-dom/src/client/event/plugins/TapEventPlugin.js', + 'packages/react-dom/src/events/TapEventPlugin.js', ]; // these files need to be copied to the react-native build const reactNativeSrcDependencies = [ - 'packages/react-reconciler/src/isomorphic/ReactTypes.js', + 'packages/react-reconciler/src/ReactTypes.js', 'packages/react-native-renderer/src/ReactNativeTypes.js', ]; From 7750f3e4bb40ce99c8027179d130471e2759c47a Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 20:04:11 +0100 Subject: [PATCH 2/3] Fix ReactDOMServerNode build --- scripts/rollup/bundles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index e6b4bc9d4f3a4..3650f7f85fa78 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -219,6 +219,7 @@ const bundles = [ 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', From 138a8fe2843a6ff8f178a3b614e5e46cc9982631 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 20 Oct 2017 20:08:21 +0100 Subject: [PATCH 3/3] Fix native builds --- scripts/rollup/bundles.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js index 3650f7f85fa78..04d43fdec8bf8 100644 --- a/scripts/rollup/bundles.js +++ b/scripts/rollup/bundles.js @@ -291,6 +291,7 @@ const bundles = [ manglePropertiesOnProd: false, name: 'react-native-renderer', paths: [ + 'packages/events/**/*.js', 'packages/react-native-renderer/**/*.js', 'packages/react-reconciler/**/*.js', 'packages/shared/**/*.js', @@ -322,6 +323,7 @@ const bundles = [ manglePropertiesOnProd: false, 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', @@ -348,6 +350,7 @@ const bundles = [ 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',