From b0ccf62ea36b7e52f1c3623a870f8c9b19cc8404 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Mon, 24 Oct 2016 19:16:56 -0700 Subject: [PATCH 1/4] Get rid of ReactInjection We don't use this indirection. It'll easier to break these apart without it. --- .../dom/shared/ReactDefaultInjection.js | 37 +++++++++++-------- src/renderers/dom/shared/ReactInjection.js | 34 ----------------- 2 files changed, 22 insertions(+), 49 deletions(-) delete mode 100644 src/renderers/dom/shared/ReactInjection.js diff --git a/src/renderers/dom/shared/ReactDefaultInjection.js b/src/renderers/dom/shared/ReactDefaultInjection.js index 20b89c8c9a20b..1c385b1af67bd 100644 --- a/src/renderers/dom/shared/ReactDefaultInjection.js +++ b/src/renderers/dom/shared/ReactDefaultInjection.js @@ -13,10 +13,15 @@ var ARIADOMPropertyConfig = require('ARIADOMPropertyConfig'); var BeforeInputEventPlugin = require('BeforeInputEventPlugin'); +var DOMProperty = require('DOMProperty'); var ChangeEventPlugin = require('ChangeEventPlugin'); var DefaultEventPluginOrder = require('DefaultEventPluginOrder'); var EnterLeaveEventPlugin = require('EnterLeaveEventPlugin'); +var EventPluginHub = require('EventPluginHub'); +var EventPluginUtils = require('EventPluginUtils'); var HTMLDOMPropertyConfig = require('HTMLDOMPropertyConfig'); +var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); +var ReactComponentEnvironment = require('ReactComponentEnvironment'); var ReactComponentBrowserEnvironment = require('ReactComponentBrowserEnvironment'); var ReactDOMComponent = require('ReactDOMComponent'); @@ -25,9 +30,11 @@ var ReactDOMEmptyComponent = require('ReactDOMEmptyComponent'); var ReactDOMTreeTraversal = require('ReactDOMTreeTraversal'); var ReactDOMTextComponent = require('ReactDOMTextComponent'); var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy'); +var ReactEmptyComponent = require('ReactEmptyComponent'); var ReactEventListener = require('ReactEventListener'); -var ReactInjection = require('ReactInjection'); +var ReactHostComponent = require('ReactHostComponent'); var ReactReconcileTransaction = require('ReactReconcileTransaction'); +var ReactUpdates = require('ReactUpdates'); var SVGDOMPropertyConfig = require('SVGDOMPropertyConfig'); var SelectEventPlugin = require('SelectEventPlugin'); var SimpleEventPlugin = require('SimpleEventPlugin'); @@ -43,22 +50,22 @@ function inject() { } alreadyInjected = true; - ReactInjection.EventEmitter.injectReactEventListener( + ReactBrowserEventEmitter.injection.injectReactEventListener( ReactEventListener ); /** * Inject modules for resolving DOM hierarchy and plugin ordering. */ - ReactInjection.EventPluginHub.injectEventPluginOrder(DefaultEventPluginOrder); - ReactInjection.EventPluginUtils.injectComponentTree(ReactDOMComponentTree); - ReactInjection.EventPluginUtils.injectTreeTraversal(ReactDOMTreeTraversal); + EventPluginHub.injection.injectEventPluginOrder(DefaultEventPluginOrder); + EventPluginUtils.injection.injectComponentTree(ReactDOMComponentTree); + EventPluginUtils.injection.injectTreeTraversal(ReactDOMTreeTraversal); /** * Some important event plugins included by default (without having to require * them). */ - ReactInjection.EventPluginHub.injectEventPluginsByName({ + EventPluginHub.injection.injectEventPluginsByName({ SimpleEventPlugin: SimpleEventPlugin, EnterLeaveEventPlugin: EnterLeaveEventPlugin, ChangeEventPlugin: ChangeEventPlugin, @@ -66,32 +73,32 @@ function inject() { BeforeInputEventPlugin: BeforeInputEventPlugin, }); - ReactInjection.HostComponent.injectGenericComponentClass( + ReactHostComponent.injection.injectGenericComponentClass( ReactDOMComponent ); - ReactInjection.HostComponent.injectTextComponentClass( + ReactHostComponent.injection.injectTextComponentClass( ReactDOMTextComponent ); - ReactInjection.DOMProperty.injectDOMPropertyConfig(ARIADOMPropertyConfig); - ReactInjection.DOMProperty.injectDOMPropertyConfig(HTMLDOMPropertyConfig); - ReactInjection.DOMProperty.injectDOMPropertyConfig(SVGDOMPropertyConfig); + DOMProperty.injection.injectDOMPropertyConfig(ARIADOMPropertyConfig); + DOMProperty.injection.injectDOMPropertyConfig(HTMLDOMPropertyConfig); + DOMProperty.injection.injectDOMPropertyConfig(SVGDOMPropertyConfig); - ReactInjection.EmptyComponent.injectEmptyComponentFactory( + ReactEmptyComponent.injection.injectEmptyComponentFactory( function(instantiate) { return new ReactDOMEmptyComponent(instantiate); } ); - ReactInjection.Updates.injectReconcileTransaction( + ReactUpdates.injection.injectReconcileTransaction( ReactReconcileTransaction ); - ReactInjection.Updates.injectBatchingStrategy( + ReactUpdates.injection.injectBatchingStrategy( ReactDefaultBatchingStrategy ); - ReactInjection.Component.injectEnvironment(ReactComponentBrowserEnvironment); + ReactComponentEnvironment.injection.injectEnvironment(ReactComponentBrowserEnvironment); } module.exports = { diff --git a/src/renderers/dom/shared/ReactInjection.js b/src/renderers/dom/shared/ReactInjection.js deleted file mode 100644 index 25ef6325b96b1..0000000000000 --- a/src/renderers/dom/shared/ReactInjection.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright 2013-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * - * @providesModule ReactInjection - */ - -'use strict'; - -var DOMProperty = require('DOMProperty'); -var EventPluginHub = require('EventPluginHub'); -var EventPluginUtils = require('EventPluginUtils'); -var ReactComponentEnvironment = require('ReactComponentEnvironment'); -var ReactEmptyComponent = require('ReactEmptyComponent'); -var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); -var ReactHostComponent = require('ReactHostComponent'); -var ReactUpdates = require('ReactUpdates'); - -var ReactInjection = { - Component: ReactComponentEnvironment.injection, - DOMProperty: DOMProperty.injection, - EmptyComponent: ReactEmptyComponent.injection, - EventPluginHub: EventPluginHub.injection, - EventPluginUtils: EventPluginUtils.injection, - EventEmitter: ReactBrowserEventEmitter.injection, - HostComponent: ReactHostComponent.injection, - Updates: ReactUpdates.injection, -}; - -module.exports = ReactInjection; From 4ba8bef19a5e693c8b84576ccdcda859a50463a0 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Mon, 24 Oct 2016 19:44:55 -0700 Subject: [PATCH 2/4] Split DefaultInjection into two files This splits DefaultInjection into one with all the properties and event configuration and a separate one for the things that are relevant to he stack reconciler. That way we can reuse the property and event system for Fiber without pulling in all the other stuff. --- src/renderers/dom/ReactDOM.js | 6 +- src/renderers/dom/ReactDOMServer.js | 6 +- ...faultInjection.js => ReactDOMInjection.js} | 36 +---------- .../dom/shared/ReactDOMStackInjection.js | 63 +++++++++++++++++++ .../__tests__/DOMPropertyOperations-test.js | 4 +- .../__tests__/ReactDOMComponent-test.js | 6 +- src/renderers/native/ReactNative.js | 6 +- src/renderers/native/ReactNativeInjection.js | 62 ++++++++++++++++++ ...ection.js => ReactNativeStackInjection.js} | 37 +---------- src/test/ReactShallowRenderer.js | 6 +- 10 files changed, 149 insertions(+), 83 deletions(-) rename src/renderers/dom/shared/{ReactDefaultInjection.js => ReactDOMInjection.js} (67%) create mode 100644 src/renderers/dom/shared/ReactDOMStackInjection.js create mode 100644 src/renderers/native/ReactNativeInjection.js rename src/renderers/native/{ReactNativeDefaultInjection.js => ReactNativeStackInjection.js} (62%) diff --git a/src/renderers/dom/ReactDOM.js b/src/renderers/dom/ReactDOM.js index ff39dc5aa471a..ac5ce44168902 100644 --- a/src/renderers/dom/ReactDOM.js +++ b/src/renderers/dom/ReactDOM.js @@ -14,7 +14,8 @@ 'use strict'; var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var ReactDefaultInjection = require('ReactDefaultInjection'); +var ReactDOMInjection = require('ReactDOMInjection'); +var ReactDOMStackInjection = require('ReactDOMStackInjection'); var ReactMount = require('ReactMount'); var ReactReconciler = require('ReactReconciler'); var ReactUpdates = require('ReactUpdates'); @@ -25,7 +26,8 @@ var getHostComponentFromComposite = require('getHostComponentFromComposite'); var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer'); var warning = require('warning'); -ReactDefaultInjection.inject(); +ReactDOMInjection.inject(); +ReactDOMStackInjection.inject(); var ReactDOM = { findDOMNode: findDOMNode, diff --git a/src/renderers/dom/ReactDOMServer.js b/src/renderers/dom/ReactDOMServer.js index 35337083e76f6..1ab1687096b5a 100644 --- a/src/renderers/dom/ReactDOMServer.js +++ b/src/renderers/dom/ReactDOMServer.js @@ -11,11 +11,13 @@ 'use strict'; -var ReactDefaultInjection = require('ReactDefaultInjection'); +var ReactDOMInjection = require('ReactDOMInjection'); +var ReactDOMStackInjection = require('ReactDOMStackInjection'); var ReactServerRendering = require('ReactServerRendering'); var ReactVersion = require('ReactVersion'); -ReactDefaultInjection.inject(); +ReactDOMInjection.inject(); +ReactDOMStackInjection.inject(); var ReactDOMServer = { renderToString: ReactServerRendering.renderToString, diff --git a/src/renderers/dom/shared/ReactDefaultInjection.js b/src/renderers/dom/shared/ReactDOMInjection.js similarity index 67% rename from src/renderers/dom/shared/ReactDefaultInjection.js rename to src/renderers/dom/shared/ReactDOMInjection.js index 1c385b1af67bd..5e21e281b88f0 100644 --- a/src/renderers/dom/shared/ReactDefaultInjection.js +++ b/src/renderers/dom/shared/ReactDOMInjection.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule ReactDefaultInjection + * @providesModule ReactDOMInjection */ 'use strict'; @@ -21,20 +21,9 @@ var EventPluginHub = require('EventPluginHub'); var EventPluginUtils = require('EventPluginUtils'); var HTMLDOMPropertyConfig = require('HTMLDOMPropertyConfig'); var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); -var ReactComponentEnvironment = require('ReactComponentEnvironment'); -var ReactComponentBrowserEnvironment = - require('ReactComponentBrowserEnvironment'); -var ReactDOMComponent = require('ReactDOMComponent'); var ReactDOMComponentTree = require('ReactDOMComponentTree'); -var ReactDOMEmptyComponent = require('ReactDOMEmptyComponent'); var ReactDOMTreeTraversal = require('ReactDOMTreeTraversal'); -var ReactDOMTextComponent = require('ReactDOMTextComponent'); -var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy'); -var ReactEmptyComponent = require('ReactEmptyComponent'); var ReactEventListener = require('ReactEventListener'); -var ReactHostComponent = require('ReactHostComponent'); -var ReactReconcileTransaction = require('ReactReconcileTransaction'); -var ReactUpdates = require('ReactUpdates'); var SVGDOMPropertyConfig = require('SVGDOMPropertyConfig'); var SelectEventPlugin = require('SelectEventPlugin'); var SimpleEventPlugin = require('SimpleEventPlugin'); @@ -73,32 +62,9 @@ function inject() { BeforeInputEventPlugin: BeforeInputEventPlugin, }); - ReactHostComponent.injection.injectGenericComponentClass( - ReactDOMComponent - ); - - ReactHostComponent.injection.injectTextComponentClass( - ReactDOMTextComponent - ); - DOMProperty.injection.injectDOMPropertyConfig(ARIADOMPropertyConfig); DOMProperty.injection.injectDOMPropertyConfig(HTMLDOMPropertyConfig); DOMProperty.injection.injectDOMPropertyConfig(SVGDOMPropertyConfig); - - ReactEmptyComponent.injection.injectEmptyComponentFactory( - function(instantiate) { - return new ReactDOMEmptyComponent(instantiate); - } - ); - - ReactUpdates.injection.injectReconcileTransaction( - ReactReconcileTransaction - ); - ReactUpdates.injection.injectBatchingStrategy( - ReactDefaultBatchingStrategy - ); - - ReactComponentEnvironment.injection.injectEnvironment(ReactComponentBrowserEnvironment); } module.exports = { diff --git a/src/renderers/dom/shared/ReactDOMStackInjection.js b/src/renderers/dom/shared/ReactDOMStackInjection.js new file mode 100644 index 0000000000000..7da0618673cfe --- /dev/null +++ b/src/renderers/dom/shared/ReactDOMStackInjection.js @@ -0,0 +1,63 @@ +/** + * Copyright 2013-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule ReactDOMStackInjection + */ + +'use strict'; + +var ReactComponentEnvironment = require('ReactComponentEnvironment'); +var ReactComponentBrowserEnvironment = + require('ReactComponentBrowserEnvironment'); +var ReactDOMComponent = require('ReactDOMComponent'); +var ReactDOMEmptyComponent = require('ReactDOMEmptyComponent'); +var ReactDOMTextComponent = require('ReactDOMTextComponent'); +var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy'); +var ReactEmptyComponent = require('ReactEmptyComponent'); +var ReactHostComponent = require('ReactHostComponent'); +var ReactReconcileTransaction = require('ReactReconcileTransaction'); +var ReactUpdates = require('ReactUpdates'); + +var alreadyInjected = false; + +function inject() { + if (alreadyInjected) { + // TODO: This is currently true because these injections are shared between + // the client and the server package. They should be built independently + // and not share any injection state. Then this problem will be solved. + return; + } + alreadyInjected = true; + + ReactHostComponent.injection.injectGenericComponentClass( + ReactDOMComponent + ); + + ReactHostComponent.injection.injectTextComponentClass( + ReactDOMTextComponent + ); + + ReactEmptyComponent.injection.injectEmptyComponentFactory( + function(instantiate) { + return new ReactDOMEmptyComponent(instantiate); + } + ); + + ReactUpdates.injection.injectReconcileTransaction( + ReactReconcileTransaction + ); + ReactUpdates.injection.injectBatchingStrategy( + ReactDefaultBatchingStrategy + ); + + ReactComponentEnvironment.injection.injectEnvironment(ReactComponentBrowserEnvironment); +} + +module.exports = { + inject: inject, +}; diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js index 972ef0b71b576..7ece10024914b 100644 --- a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js +++ b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js @@ -18,8 +18,8 @@ describe('DOMPropertyOperations', () => { beforeEach(() => { jest.resetModuleRegistry(); - var ReactDefaultInjection = require('ReactDefaultInjection'); - ReactDefaultInjection.inject(); + var ReactDOMInjection = require('ReactDOMInjection'); + ReactDOMInjection.inject(); DOMPropertyOperations = require('DOMPropertyOperations'); DOMProperty = require('DOMProperty'); diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js index aceb8925a80dd..3e0b4bbc9f5b5 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js @@ -626,8 +626,10 @@ describe('ReactDOMComponent', () => { } beforeEach(() => { - var ReactDefaultInjection = require('ReactDefaultInjection'); - ReactDefaultInjection.inject(); + var ReactDOMInjection = require('ReactDOMInjection'); + ReactDOMInjection.inject(); + var ReactDOMStackInjection = require('ReactDOMInjection'); + ReactDOMStackInjection.inject(); var ReactDOMComponent = require('ReactDOMComponent'); var ReactReconcileTransaction = require('ReactReconcileTransaction'); diff --git a/src/renderers/native/ReactNative.js b/src/renderers/native/ReactNative.js index 23648da925966..6112e9045b2b3 100644 --- a/src/renderers/native/ReactNative.js +++ b/src/renderers/native/ReactNative.js @@ -14,14 +14,16 @@ // Require ReactNativeDefaultInjection first for its side effects of setting up // the JS environment var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var ReactNativeDefaultInjection = require('ReactNativeDefaultInjection'); +var ReactNativeInjection = require('ReactNativeInjection'); +var ReactNativeStackInjection = require('ReactNativeStackInjection'); var ReactNativeMount = require('ReactNativeMount'); var ReactUpdates = require('ReactUpdates'); var findNodeHandle = require('findNodeHandle'); -ReactNativeDefaultInjection.inject(); +ReactNativeInjection.inject(); +ReactNativeStackInjection.inject(); var render = function( element: ReactElement, diff --git a/src/renderers/native/ReactNativeInjection.js b/src/renderers/native/ReactNativeInjection.js new file mode 100644 index 0000000000000..6f6293fde3a92 --- /dev/null +++ b/src/renderers/native/ReactNativeInjection.js @@ -0,0 +1,62 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule ReactNativeInjection + * @flow + */ +'use strict'; + +/** + * Make sure essential globals are available and are patched correctly. Please don't remove this + * line. Bundles created by react-packager `require` it before executing any application code. This + * ensures it exists in the dependency graph and can be `require`d. + * TODO: require this in packager, not in React #10932517 + */ +require('InitializeJavaScriptAppEngine'); + +var EventPluginHub = require('EventPluginHub'); +var EventPluginUtils = require('EventPluginUtils'); +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 ReactNativeTreeTraversal = require('ReactNativeTreeTraversal'); +var ResponderEventPlugin = require('ResponderEventPlugin'); + +function inject() { + /** + * Register the event emitter with the native bridge + */ + RCTEventEmitter.register(ReactNativeEventEmitter); + + /** + * Inject module for resolving DOM hierarchy and plugin ordering. + */ + EventPluginHub.injection.injectEventPluginOrder(ReactNativeEventPluginOrder); + EventPluginUtils.injection.injectComponentTree(ReactNativeComponentTree); + EventPluginUtils.injection.injectTreeTraversal(ReactNativeTreeTraversal); + + ResponderEventPlugin.injection.injectGlobalResponderHandler( + ReactNativeGlobalResponderHandler + ); + + /** + * Some important event plugins included by default (without having to require + * them). + */ + EventPluginHub.injection.injectEventPluginsByName({ + 'ResponderEventPlugin': ResponderEventPlugin, + 'ReactNativeBridgeEventPlugin': ReactNativeBridgeEventPlugin, + }); +} + +module.exports = { + inject: inject, +}; diff --git a/src/renderers/native/ReactNativeDefaultInjection.js b/src/renderers/native/ReactNativeStackInjection.js similarity index 62% rename from src/renderers/native/ReactNativeDefaultInjection.js rename to src/renderers/native/ReactNativeStackInjection.js index 4d15ab5771257..01181a65f81d6 100644 --- a/src/renderers/native/ReactNativeDefaultInjection.js +++ b/src/renderers/native/ReactNativeStackInjection.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule ReactNativeDefaultInjection + * @providesModule ReactNativeStackInjection * @flow */ 'use strict'; @@ -19,54 +19,19 @@ */ require('InitializeJavaScriptAppEngine'); -var EventPluginHub = require('EventPluginHub'); -var EventPluginUtils = require('EventPluginUtils'); -var RCTEventEmitter = require('RCTEventEmitter'); var React = require('React'); var ReactComponentEnvironment = require('ReactComponentEnvironment'); var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy'); var ReactEmptyComponent = require('ReactEmptyComponent'); -var ReactNativeBridgeEventPlugin = require('ReactNativeBridgeEventPlugin'); var ReactHostComponent = require('ReactHostComponent'); var ReactNativeComponentEnvironment = require('ReactNativeComponentEnvironment'); -var ReactNativeComponentTree = require('ReactNativeComponentTree'); -var ReactNativeEventEmitter = require('ReactNativeEventEmitter'); -var ReactNativeEventPluginOrder = require('ReactNativeEventPluginOrder'); -var ReactNativeGlobalResponderHandler = require('ReactNativeGlobalResponderHandler'); var ReactNativeTextComponent = require('ReactNativeTextComponent'); -var ReactNativeTreeTraversal = require('ReactNativeTreeTraversal'); var ReactSimpleEmptyComponent = require('ReactSimpleEmptyComponent'); var ReactUpdates = require('ReactUpdates'); -var ResponderEventPlugin = require('ResponderEventPlugin'); var invariant = require('invariant'); function inject() { - /** - * Register the event emitter with the native bridge - */ - RCTEventEmitter.register(ReactNativeEventEmitter); - - /** - * Inject module for resolving DOM hierarchy and plugin ordering. - */ - EventPluginHub.injection.injectEventPluginOrder(ReactNativeEventPluginOrder); - EventPluginUtils.injection.injectComponentTree(ReactNativeComponentTree); - EventPluginUtils.injection.injectTreeTraversal(ReactNativeTreeTraversal); - - ResponderEventPlugin.injection.injectGlobalResponderHandler( - ReactNativeGlobalResponderHandler - ); - - /** - * Some important event plugins included by default (without having to require - * them). - */ - EventPluginHub.injection.injectEventPluginsByName({ - 'ResponderEventPlugin': ResponderEventPlugin, - 'ReactNativeBridgeEventPlugin': ReactNativeBridgeEventPlugin, - }); - ReactUpdates.injection.injectReconcileTransaction( ReactNativeComponentEnvironment.ReactReconcileTransaction ); diff --git a/src/test/ReactShallowRenderer.js b/src/test/ReactShallowRenderer.js index d8f10f2f8fbd0..1517d49cff824 100644 --- a/src/test/ReactShallowRenderer.js +++ b/src/test/ReactShallowRenderer.js @@ -13,7 +13,8 @@ 'use strict'; var React = require('React'); -var ReactDefaultInjection = require('ReactDefaultInjection'); +var ReactDOMInjection = require('ReactDOMInjection'); +var ReactDOMStackInjection = require('ReactDOMStackInjection'); var ReactCompositeComponent = require('ReactCompositeComponent'); var ReactReconciler = require('ReactReconciler'); var ReactUpdates = require('ReactUpdates'); @@ -84,7 +85,8 @@ class ReactShallowRenderer { // Ensure we've done the default injections. This might not be true in the // case of a simple test that only requires React and the TestUtils in // conjunction with an inline-requires transform. - ReactDefaultInjection.inject(); + ReactDOMInjection.inject(); + ReactDOMStackInjection.inject(); invariant( React.isValidElement(element), From b26168cadbebe198f2a441031ba676c533111731 Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Mon, 24 Oct 2016 19:59:04 -0700 Subject: [PATCH 3/4] DefaultEventPluginOrder -> DOMEventPluginOrder This is not a generic plugin order. It's DOM specific. Unlike say DefaultBatchingStrategy which is used by Native too. --- .../{DefaultEventPluginOrder.js => DOMEventPluginOrder.js} | 6 +++--- src/renderers/dom/shared/ReactDOMInjection.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/renderers/dom/client/eventPlugins/{DefaultEventPluginOrder.js => DOMEventPluginOrder.js} (89%) diff --git a/src/renderers/dom/client/eventPlugins/DefaultEventPluginOrder.js b/src/renderers/dom/client/eventPlugins/DOMEventPluginOrder.js similarity index 89% rename from src/renderers/dom/client/eventPlugins/DefaultEventPluginOrder.js rename to src/renderers/dom/client/eventPlugins/DOMEventPluginOrder.js index a04c61244670d..510ec07ad0b11 100644 --- a/src/renderers/dom/client/eventPlugins/DefaultEventPluginOrder.js +++ b/src/renderers/dom/client/eventPlugins/DOMEventPluginOrder.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule DefaultEventPluginOrder + * @providesModule DOMEventPluginOrder */ 'use strict'; @@ -20,7 +20,7 @@ * `ResponderEventPlugin` must occur before `SimpleEventPlugin` so that * preventing default on events is convenient in `SimpleEventPlugin` handlers. */ -var DefaultEventPluginOrder = [ +var DOMEventPluginOrder = [ 'ResponderEventPlugin', 'SimpleEventPlugin', 'TapEventPlugin', @@ -30,4 +30,4 @@ var DefaultEventPluginOrder = [ 'BeforeInputEventPlugin', ]; -module.exports = DefaultEventPluginOrder; +module.exports = DOMEventPluginOrder; diff --git a/src/renderers/dom/shared/ReactDOMInjection.js b/src/renderers/dom/shared/ReactDOMInjection.js index 5e21e281b88f0..b9058b8602d34 100644 --- a/src/renderers/dom/shared/ReactDOMInjection.js +++ b/src/renderers/dom/shared/ReactDOMInjection.js @@ -15,7 +15,7 @@ var ARIADOMPropertyConfig = require('ARIADOMPropertyConfig'); var BeforeInputEventPlugin = require('BeforeInputEventPlugin'); var DOMProperty = require('DOMProperty'); var ChangeEventPlugin = require('ChangeEventPlugin'); -var DefaultEventPluginOrder = require('DefaultEventPluginOrder'); +var DOMEventPluginOrder = require('DOMEventPluginOrder'); var EnterLeaveEventPlugin = require('EnterLeaveEventPlugin'); var EventPluginHub = require('EventPluginHub'); var EventPluginUtils = require('EventPluginUtils'); @@ -46,7 +46,7 @@ function inject() { /** * Inject modules for resolving DOM hierarchy and plugin ordering. */ - EventPluginHub.injection.injectEventPluginOrder(DefaultEventPluginOrder); + EventPluginHub.injection.injectEventPluginOrder(DOMEventPluginOrder); EventPluginUtils.injection.injectComponentTree(ReactDOMComponentTree); EventPluginUtils.injection.injectTreeTraversal(ReactDOMTreeTraversal); From a3fb0310ca6f7cad0707b5a9fd004c19e004186f Mon Sep 17 00:00:00 2001 From: Sebastian Markbage Date: Tue, 25 Oct 2016 10:54:14 -0700 Subject: [PATCH 4/4] Reorganize files This is just moving a bunch of DOM files. It moves things into dom/stack and dom/fiber respectively. The dom/stack folder remains split into client/server. Mainly the shared folder is now my best guess for files that we can reuse in fiber. Everything else will get forked or reimplemented. Also moved the event system out of renderers/shared/stack and into renderers/shared/shared. --- .../dom/{client => shared}/ReactBrowserEventEmitter.js | 0 src/renderers/dom/{client => shared}/ReactDOMComponentTree.js | 0 src/renderers/dom/{client => shared}/ReactDOMSelection.js | 0 src/renderers/dom/{client => shared}/ReactDOMTreeTraversal.js | 0 src/renderers/dom/{client => shared}/ReactEventListener.js | 0 src/renderers/dom/{client => shared}/ReactInputSelection.js | 0 .../__tests__/ReactBrowserEventEmitter-test.js | 0 src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js | 2 +- .../{client => shared}/__tests__/ReactDOMComponentTree-test.js | 0 .../{client => shared}/__tests__/ReactDOMIDOperations-test.js | 0 .../dom/{client => shared}/__tests__/ReactDOMSVG-test.js | 0 .../{client => shared}/__tests__/ReactDOMTreeTraversal-test.js | 0 .../{client => shared}/__tests__/ReactEventIndependence-test.js | 0 .../dom/{client => shared}/__tests__/ReactEventListener-test.js | 0 .../dom/{client => shared}/__tests__/inputValueTracking-test.js | 0 .../dom/{client => shared}/__tests__/validateDOMNesting-test.js | 0 .../{client => shared}/eventPlugins/BeforeInputEventPlugin.js | 0 .../dom/{client => shared}/eventPlugins/ChangeEventPlugin.js | 0 .../dom/{client => shared}/eventPlugins/DOMEventPluginOrder.js | 0 .../{client => shared}/eventPlugins/EnterLeaveEventPlugin.js | 0 .../{client => shared}/eventPlugins/FallbackCompositionState.js | 0 .../dom/{client => shared}/eventPlugins/SelectEventPlugin.js | 0 .../dom/{client => shared}/eventPlugins/SimpleEventPlugin.js | 0 .../dom/{client => shared}/eventPlugins/TapEventPlugin.js | 0 .../eventPlugins/__tests__/BeforeInputEventPlugin-test.js | 0 .../eventPlugins/__tests__/ChangeEventPlugin-test.js | 0 .../eventPlugins/__tests__/EnterLeaveEventPlugin-test.js | 0 .../eventPlugins/__tests__/FallbackCompositionState-test.js | 0 .../eventPlugins/__tests__/SelectEventPlugin-test.js | 0 .../eventPlugins/__tests__/SimpleEventPlugin-test.js | 0 src/renderers/dom/{client => shared}/inputValueTracking.js | 0 .../syntheticEvents/SyntheticAnimationEvent.js | 0 .../syntheticEvents/SyntheticClipboardEvent.js | 0 .../syntheticEvents/SyntheticCompositionEvent.js | 0 .../{client => shared}/syntheticEvents/SyntheticDragEvent.js | 0 .../{client => shared}/syntheticEvents/SyntheticFocusEvent.js | 0 .../{client => shared}/syntheticEvents/SyntheticInputEvent.js | 0 .../syntheticEvents/SyntheticKeyboardEvent.js | 0 .../{client => shared}/syntheticEvents/SyntheticMouseEvent.js | 0 .../{client => shared}/syntheticEvents/SyntheticTouchEvent.js | 0 .../syntheticEvents/SyntheticTransitionEvent.js | 0 .../dom/{client => shared}/syntheticEvents/SyntheticUIEvent.js | 0 .../{client => shared}/syntheticEvents/SyntheticWheelEvent.js | 0 .../syntheticEvents/__tests__/SyntheticClipboardEvent-test.js | 0 .../syntheticEvents/__tests__/SyntheticEvent-test.js | 0 .../syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js | 0 .../syntheticEvents/__tests__/SyntheticWheelEvent-test.js | 0 .../dom/{client/wrappers => shared/utils}/AutoFocusUtils.js | 0 .../dom/{client/wrappers => shared/utils}/LinkedValueUtils.js | 0 src/renderers/dom/{client => shared}/utils/ViewportMetrics.js | 0 .../{client => shared}/utils/__tests__/getEventCharCode-test.js | 0 .../dom/{client => shared}/utils/__tests__/getEventKey-test.js | 0 .../utils/__tests__/getNodeForCharacterOffset-test.js | 0 .../dom/{client => shared}/utils/__tests__/setInnerHTML-test.js | 0 src/renderers/dom/{client => shared}/utils/getEventCharCode.js | 0 src/renderers/dom/{client => shared}/utils/getEventKey.js | 0 .../dom/{client => shared}/utils/getEventModifierState.js | 0 src/renderers/dom/{client => shared}/utils/getEventTarget.js | 0 .../dom/{client => shared}/utils/getNodeForCharacterOffset.js | 0 .../dom/{client => shared}/utils/getTextContentAccessor.js | 0 .../dom/{client => shared}/utils/getVendorPrefixedEventName.js | 0 src/renderers/dom/{client => shared}/utils/isEventSupported.js | 0 src/renderers/dom/{client => shared}/validateDOMNesting.js | 0 .../wrappers/__tests__/ReactDOMIframe-test.js | 0 .../{client => shared}/wrappers/__tests__/ReactDOMInput-test.js | 0 .../wrappers/__tests__/ReactDOMOption-test.js | 0 .../wrappers/__tests__/ReactDOMSelect-test.js | 0 .../wrappers/__tests__/ReactDOMTextarea-test.js | 0 .../dom/{client/utils => stack/client}/DOMChildrenOperations.js | 0 src/renderers/dom/{client/utils => stack/client}/DOMLazyTree.js | 0 src/renderers/dom/{shared => stack/client}/Danger.js | 0 .../client}/ReactComponentBrowserEnvironment.js | 0 src/renderers/dom/{shared => stack/client}/ReactDOMComponent.js | 0 .../dom/{shared => stack/client}/ReactDOMContainerInfo.js | 0 .../dom/{shared => stack/client}/ReactDOMEmptyComponent.js | 0 src/renderers/dom/{ => stack}/client/ReactDOMIDOperations.js | 0 .../dom/{shared => stack/client}/ReactDOMStackInjection.js | 0 .../dom/{shared => stack/client}/ReactDOMTextComponent.js | 0 src/renderers/dom/{ => stack}/client/ReactMount.js | 0 .../dom/{ => stack}/client/ReactReconcileTransaction.js | 0 src/renderers/dom/{ => stack}/client/__tests__/ReactDOM-test.js | 0 .../dom/{ => stack}/client/__tests__/ReactMount-test.js | 0 .../{ => stack}/client/__tests__/ReactMountDestruction-test.js | 0 .../{ => stack}/client/__tests__/ReactRenderDocument-test.js | 0 .../dom/{ => stack}/client/__tests__/findDOMNode-test.js | 0 .../client}/createMicrosoftUnsafeLocalFunction.js | 0 src/renderers/dom/{ => stack}/client/findDOMNode.js | 0 .../dom/{ => stack}/client/renderSubtreeIntoContainer.js | 0 .../dom/{client/utils => stack/client}/setInnerHTML.js | 0 .../dom/{client/utils => stack/client}/setTextContent.js | 0 src/renderers/dom/{ => stack}/client/wrappers/ReactDOMInput.js | 0 src/renderers/dom/{ => stack}/client/wrappers/ReactDOMOption.js | 0 src/renderers/dom/{ => stack}/client/wrappers/ReactDOMSelect.js | 0 .../dom/{ => stack}/client/wrappers/ReactDOMTextarea.js | 0 src/renderers/dom/{ => stack}/server/ReactMarkupChecksum.js | 0 .../dom/{ => stack}/server/ReactServerBatchingStrategy.js | 0 src/renderers/dom/{ => stack}/server/ReactServerRendering.js | 0 .../dom/{ => stack}/server/ReactServerRenderingTransaction.js | 0 src/renderers/dom/{ => stack}/server/ReactServerUpdateQueue.js | 0 .../{ => stack}/server/__tests__/ReactServerRendering-test.js | 0 src/renderers/shared/{stack => shared}/event/EventConstants.js | 0 src/renderers/shared/{stack => shared}/event/EventPluginHub.js | 0 .../shared/{stack => shared}/event/EventPluginRegistry.js | 0 .../shared/{stack => shared}/event/EventPluginUtils.js | 0 .../shared/{stack => shared}/event/EventPropagators.js | 0 .../shared/{stack => shared}/event/PluginModuleType.js | 0 .../reconciler => shared/event}/ReactEventEmitterMixin.js | 0 .../shared/{stack => shared}/event/ReactSyntheticEventType.js | 0 src/renderers/shared/{stack => shared}/event/SyntheticEvent.js | 0 .../{stack => shared}/event/__tests__/EventPluginHub-test.js | 0 .../event/__tests__/EventPluginRegistry-test.js | 0 .../event/eventPlugins/ResponderEventPlugin.js | 0 .../event/eventPlugins/ResponderSyntheticEvent.js | 0 .../event/eventPlugins/ResponderTouchHistoryStore.js | 0 .../{stack => shared}/event/eventPlugins/TouchHistoryMath.js | 0 .../event/eventPlugins/__tests__/ResponderEventPlugin-test.js | 0 116 files changed, 1 insertion(+), 1 deletion(-) rename src/renderers/dom/{client => shared}/ReactBrowserEventEmitter.js (100%) rename src/renderers/dom/{client => shared}/ReactDOMComponentTree.js (100%) rename src/renderers/dom/{client => shared}/ReactDOMSelection.js (100%) rename src/renderers/dom/{client => shared}/ReactDOMTreeTraversal.js (100%) rename src/renderers/dom/{client => shared}/ReactEventListener.js (100%) rename src/renderers/dom/{client => shared}/ReactInputSelection.js (100%) rename src/renderers/dom/{client => shared}/__tests__/ReactBrowserEventEmitter-test.js (100%) rename src/renderers/dom/{client => shared}/__tests__/ReactDOMComponentTree-test.js (100%) rename src/renderers/dom/{client => shared}/__tests__/ReactDOMIDOperations-test.js (100%) rename src/renderers/dom/{client => shared}/__tests__/ReactDOMSVG-test.js (100%) rename src/renderers/dom/{client => shared}/__tests__/ReactDOMTreeTraversal-test.js (100%) rename src/renderers/dom/{client => shared}/__tests__/ReactEventIndependence-test.js (100%) rename src/renderers/dom/{client => shared}/__tests__/ReactEventListener-test.js (100%) rename src/renderers/dom/{client => shared}/__tests__/inputValueTracking-test.js (100%) rename src/renderers/dom/{client => shared}/__tests__/validateDOMNesting-test.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/BeforeInputEventPlugin.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/ChangeEventPlugin.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/DOMEventPluginOrder.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/EnterLeaveEventPlugin.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/FallbackCompositionState.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/SelectEventPlugin.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/SimpleEventPlugin.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/TapEventPlugin.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/__tests__/BeforeInputEventPlugin-test.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/__tests__/ChangeEventPlugin-test.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/__tests__/FallbackCompositionState-test.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/__tests__/SelectEventPlugin-test.js (100%) rename src/renderers/dom/{client => shared}/eventPlugins/__tests__/SimpleEventPlugin-test.js (100%) rename src/renderers/dom/{client => shared}/inputValueTracking.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticAnimationEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticClipboardEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticCompositionEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticDragEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticFocusEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticInputEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticKeyboardEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticMouseEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticTouchEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticTransitionEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticUIEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/SyntheticWheelEvent.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/__tests__/SyntheticEvent-test.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js (100%) rename src/renderers/dom/{client => shared}/syntheticEvents/__tests__/SyntheticWheelEvent-test.js (100%) rename src/renderers/dom/{client/wrappers => shared/utils}/AutoFocusUtils.js (100%) rename src/renderers/dom/{client/wrappers => shared/utils}/LinkedValueUtils.js (100%) rename src/renderers/dom/{client => shared}/utils/ViewportMetrics.js (100%) rename src/renderers/dom/{client => shared}/utils/__tests__/getEventCharCode-test.js (100%) rename src/renderers/dom/{client => shared}/utils/__tests__/getEventKey-test.js (100%) rename src/renderers/dom/{client => shared}/utils/__tests__/getNodeForCharacterOffset-test.js (100%) rename src/renderers/dom/{client => shared}/utils/__tests__/setInnerHTML-test.js (100%) rename src/renderers/dom/{client => shared}/utils/getEventCharCode.js (100%) rename src/renderers/dom/{client => shared}/utils/getEventKey.js (100%) rename src/renderers/dom/{client => shared}/utils/getEventModifierState.js (100%) rename src/renderers/dom/{client => shared}/utils/getEventTarget.js (100%) rename src/renderers/dom/{client => shared}/utils/getNodeForCharacterOffset.js (100%) rename src/renderers/dom/{client => shared}/utils/getTextContentAccessor.js (100%) rename src/renderers/dom/{client => shared}/utils/getVendorPrefixedEventName.js (100%) rename src/renderers/dom/{client => shared}/utils/isEventSupported.js (100%) rename src/renderers/dom/{client => shared}/validateDOMNesting.js (100%) rename src/renderers/dom/{client => shared}/wrappers/__tests__/ReactDOMIframe-test.js (100%) rename src/renderers/dom/{client => shared}/wrappers/__tests__/ReactDOMInput-test.js (100%) rename src/renderers/dom/{client => shared}/wrappers/__tests__/ReactDOMOption-test.js (100%) rename src/renderers/dom/{client => shared}/wrappers/__tests__/ReactDOMSelect-test.js (100%) rename src/renderers/dom/{client => shared}/wrappers/__tests__/ReactDOMTextarea-test.js (100%) rename src/renderers/dom/{client/utils => stack/client}/DOMChildrenOperations.js (100%) rename src/renderers/dom/{client/utils => stack/client}/DOMLazyTree.js (100%) rename src/renderers/dom/{shared => stack/client}/Danger.js (100%) rename src/renderers/dom/{shared => stack/client}/ReactComponentBrowserEnvironment.js (100%) rename src/renderers/dom/{shared => stack/client}/ReactDOMComponent.js (100%) rename src/renderers/dom/{shared => stack/client}/ReactDOMContainerInfo.js (100%) rename src/renderers/dom/{shared => stack/client}/ReactDOMEmptyComponent.js (100%) rename src/renderers/dom/{ => stack}/client/ReactDOMIDOperations.js (100%) rename src/renderers/dom/{shared => stack/client}/ReactDOMStackInjection.js (100%) rename src/renderers/dom/{shared => stack/client}/ReactDOMTextComponent.js (100%) rename src/renderers/dom/{ => stack}/client/ReactMount.js (100%) rename src/renderers/dom/{ => stack}/client/ReactReconcileTransaction.js (100%) rename src/renderers/dom/{ => stack}/client/__tests__/ReactDOM-test.js (100%) rename src/renderers/dom/{ => stack}/client/__tests__/ReactMount-test.js (100%) rename src/renderers/dom/{ => stack}/client/__tests__/ReactMountDestruction-test.js (100%) rename src/renderers/dom/{ => stack}/client/__tests__/ReactRenderDocument-test.js (100%) rename src/renderers/dom/{ => stack}/client/__tests__/findDOMNode-test.js (100%) rename src/renderers/dom/{client/utils => stack/client}/createMicrosoftUnsafeLocalFunction.js (100%) rename src/renderers/dom/{ => stack}/client/findDOMNode.js (100%) rename src/renderers/dom/{ => stack}/client/renderSubtreeIntoContainer.js (100%) rename src/renderers/dom/{client/utils => stack/client}/setInnerHTML.js (100%) rename src/renderers/dom/{client/utils => stack/client}/setTextContent.js (100%) rename src/renderers/dom/{ => stack}/client/wrappers/ReactDOMInput.js (100%) rename src/renderers/dom/{ => stack}/client/wrappers/ReactDOMOption.js (100%) rename src/renderers/dom/{ => stack}/client/wrappers/ReactDOMSelect.js (100%) rename src/renderers/dom/{ => stack}/client/wrappers/ReactDOMTextarea.js (100%) rename src/renderers/dom/{ => stack}/server/ReactMarkupChecksum.js (100%) rename src/renderers/dom/{ => stack}/server/ReactServerBatchingStrategy.js (100%) rename src/renderers/dom/{ => stack}/server/ReactServerRendering.js (100%) rename src/renderers/dom/{ => stack}/server/ReactServerRenderingTransaction.js (100%) rename src/renderers/dom/{ => stack}/server/ReactServerUpdateQueue.js (100%) rename src/renderers/dom/{ => stack}/server/__tests__/ReactServerRendering-test.js (100%) rename src/renderers/shared/{stack => shared}/event/EventConstants.js (100%) rename src/renderers/shared/{stack => shared}/event/EventPluginHub.js (100%) rename src/renderers/shared/{stack => shared}/event/EventPluginRegistry.js (100%) rename src/renderers/shared/{stack => shared}/event/EventPluginUtils.js (100%) rename src/renderers/shared/{stack => shared}/event/EventPropagators.js (100%) rename src/renderers/shared/{stack => shared}/event/PluginModuleType.js (100%) rename src/renderers/shared/{stack/reconciler => shared/event}/ReactEventEmitterMixin.js (100%) rename src/renderers/shared/{stack => shared}/event/ReactSyntheticEventType.js (100%) rename src/renderers/shared/{stack => shared}/event/SyntheticEvent.js (100%) rename src/renderers/shared/{stack => shared}/event/__tests__/EventPluginHub-test.js (100%) rename src/renderers/shared/{stack => shared}/event/__tests__/EventPluginRegistry-test.js (100%) rename src/renderers/shared/{stack => shared}/event/eventPlugins/ResponderEventPlugin.js (100%) rename src/renderers/shared/{stack => shared}/event/eventPlugins/ResponderSyntheticEvent.js (100%) rename src/renderers/shared/{stack => shared}/event/eventPlugins/ResponderTouchHistoryStore.js (100%) rename src/renderers/shared/{stack => shared}/event/eventPlugins/TouchHistoryMath.js (100%) rename src/renderers/shared/{stack => shared}/event/eventPlugins/__tests__/ResponderEventPlugin-test.js (100%) diff --git a/src/renderers/dom/client/ReactBrowserEventEmitter.js b/src/renderers/dom/shared/ReactBrowserEventEmitter.js similarity index 100% rename from src/renderers/dom/client/ReactBrowserEventEmitter.js rename to src/renderers/dom/shared/ReactBrowserEventEmitter.js diff --git a/src/renderers/dom/client/ReactDOMComponentTree.js b/src/renderers/dom/shared/ReactDOMComponentTree.js similarity index 100% rename from src/renderers/dom/client/ReactDOMComponentTree.js rename to src/renderers/dom/shared/ReactDOMComponentTree.js diff --git a/src/renderers/dom/client/ReactDOMSelection.js b/src/renderers/dom/shared/ReactDOMSelection.js similarity index 100% rename from src/renderers/dom/client/ReactDOMSelection.js rename to src/renderers/dom/shared/ReactDOMSelection.js diff --git a/src/renderers/dom/client/ReactDOMTreeTraversal.js b/src/renderers/dom/shared/ReactDOMTreeTraversal.js similarity index 100% rename from src/renderers/dom/client/ReactDOMTreeTraversal.js rename to src/renderers/dom/shared/ReactDOMTreeTraversal.js diff --git a/src/renderers/dom/client/ReactEventListener.js b/src/renderers/dom/shared/ReactEventListener.js similarity index 100% rename from src/renderers/dom/client/ReactEventListener.js rename to src/renderers/dom/shared/ReactEventListener.js diff --git a/src/renderers/dom/client/ReactInputSelection.js b/src/renderers/dom/shared/ReactInputSelection.js similarity index 100% rename from src/renderers/dom/client/ReactInputSelection.js rename to src/renderers/dom/shared/ReactInputSelection.js diff --git a/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js rename to src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js index 3e0b4bbc9f5b5..36d284170084e 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js @@ -628,7 +628,7 @@ describe('ReactDOMComponent', () => { beforeEach(() => { var ReactDOMInjection = require('ReactDOMInjection'); ReactDOMInjection.inject(); - var ReactDOMStackInjection = require('ReactDOMInjection'); + var ReactDOMStackInjection = require('ReactDOMStackInjection'); ReactDOMStackInjection.inject(); var ReactDOMComponent = require('ReactDOMComponent'); diff --git a/src/renderers/dom/client/__tests__/ReactDOMComponentTree-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactDOMComponentTree-test.js rename to src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js diff --git a/src/renderers/dom/client/__tests__/ReactDOMIDOperations-test.js b/src/renderers/dom/shared/__tests__/ReactDOMIDOperations-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactDOMIDOperations-test.js rename to src/renderers/dom/shared/__tests__/ReactDOMIDOperations-test.js diff --git a/src/renderers/dom/client/__tests__/ReactDOMSVG-test.js b/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactDOMSVG-test.js rename to src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js diff --git a/src/renderers/dom/client/__tests__/ReactDOMTreeTraversal-test.js b/src/renderers/dom/shared/__tests__/ReactDOMTreeTraversal-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactDOMTreeTraversal-test.js rename to src/renderers/dom/shared/__tests__/ReactDOMTreeTraversal-test.js diff --git a/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js b/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactEventIndependence-test.js rename to src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js diff --git a/src/renderers/dom/client/__tests__/ReactEventListener-test.js b/src/renderers/dom/shared/__tests__/ReactEventListener-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactEventListener-test.js rename to src/renderers/dom/shared/__tests__/ReactEventListener-test.js diff --git a/src/renderers/dom/client/__tests__/inputValueTracking-test.js b/src/renderers/dom/shared/__tests__/inputValueTracking-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/inputValueTracking-test.js rename to src/renderers/dom/shared/__tests__/inputValueTracking-test.js diff --git a/src/renderers/dom/client/__tests__/validateDOMNesting-test.js b/src/renderers/dom/shared/__tests__/validateDOMNesting-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/validateDOMNesting-test.js rename to src/renderers/dom/shared/__tests__/validateDOMNesting-test.js diff --git a/src/renderers/dom/client/eventPlugins/BeforeInputEventPlugin.js b/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/BeforeInputEventPlugin.js rename to src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js diff --git a/src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/ChangeEventPlugin.js rename to src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js diff --git a/src/renderers/dom/client/eventPlugins/DOMEventPluginOrder.js b/src/renderers/dom/shared/eventPlugins/DOMEventPluginOrder.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/DOMEventPluginOrder.js rename to src/renderers/dom/shared/eventPlugins/DOMEventPluginOrder.js diff --git a/src/renderers/dom/client/eventPlugins/EnterLeaveEventPlugin.js b/src/renderers/dom/shared/eventPlugins/EnterLeaveEventPlugin.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/EnterLeaveEventPlugin.js rename to src/renderers/dom/shared/eventPlugins/EnterLeaveEventPlugin.js diff --git a/src/renderers/dom/client/eventPlugins/FallbackCompositionState.js b/src/renderers/dom/shared/eventPlugins/FallbackCompositionState.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/FallbackCompositionState.js rename to src/renderers/dom/shared/eventPlugins/FallbackCompositionState.js diff --git a/src/renderers/dom/client/eventPlugins/SelectEventPlugin.js b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/SelectEventPlugin.js rename to src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js diff --git a/src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js b/src/renderers/dom/shared/eventPlugins/SimpleEventPlugin.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/SimpleEventPlugin.js rename to src/renderers/dom/shared/eventPlugins/SimpleEventPlugin.js diff --git a/src/renderers/dom/client/eventPlugins/TapEventPlugin.js b/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/TapEventPlugin.js rename to src/renderers/dom/shared/eventPlugins/TapEventPlugin.js diff --git a/src/renderers/dom/client/eventPlugins/__tests__/BeforeInputEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/__tests__/BeforeInputEventPlugin-test.js rename to src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js diff --git a/src/renderers/dom/client/eventPlugins/__tests__/ChangeEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/__tests__/ChangeEventPlugin-test.js rename to src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js diff --git a/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js rename to src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js diff --git a/src/renderers/dom/client/eventPlugins/__tests__/FallbackCompositionState-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/__tests__/FallbackCompositionState-test.js rename to src/renderers/dom/shared/eventPlugins/__tests__/FallbackCompositionState-test.js diff --git a/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js rename to src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js diff --git a/src/renderers/dom/client/eventPlugins/__tests__/SimpleEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js similarity index 100% rename from src/renderers/dom/client/eventPlugins/__tests__/SimpleEventPlugin-test.js rename to src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js diff --git a/src/renderers/dom/client/inputValueTracking.js b/src/renderers/dom/shared/inputValueTracking.js similarity index 100% rename from src/renderers/dom/client/inputValueTracking.js rename to src/renderers/dom/shared/inputValueTracking.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticAnimationEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticAnimationEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticAnimationEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticAnimationEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticClipboardEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticClipboardEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticClipboardEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticClipboardEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticCompositionEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticCompositionEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticCompositionEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticCompositionEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticDragEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticDragEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticDragEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticDragEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticFocusEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticFocusEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticFocusEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticFocusEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticInputEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticInputEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticInputEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticInputEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticKeyboardEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticKeyboardEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticKeyboardEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticKeyboardEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticMouseEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticMouseEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticTouchEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticTouchEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticTouchEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticTouchEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticTransitionEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticTransitionEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticTransitionEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticTransitionEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticUIEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticUIEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticUIEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticUIEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/SyntheticWheelEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticWheelEvent.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/SyntheticWheelEvent.js rename to src/renderers/dom/shared/syntheticEvents/SyntheticWheelEvent.js diff --git a/src/renderers/dom/client/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js rename to src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js diff --git a/src/renderers/dom/client/syntheticEvents/__tests__/SyntheticEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/__tests__/SyntheticEvent-test.js rename to src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js diff --git a/src/renderers/dom/client/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js rename to src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js diff --git a/src/renderers/dom/client/syntheticEvents/__tests__/SyntheticWheelEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js similarity index 100% rename from src/renderers/dom/client/syntheticEvents/__tests__/SyntheticWheelEvent-test.js rename to src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticWheelEvent-test.js diff --git a/src/renderers/dom/client/wrappers/AutoFocusUtils.js b/src/renderers/dom/shared/utils/AutoFocusUtils.js similarity index 100% rename from src/renderers/dom/client/wrappers/AutoFocusUtils.js rename to src/renderers/dom/shared/utils/AutoFocusUtils.js diff --git a/src/renderers/dom/client/wrappers/LinkedValueUtils.js b/src/renderers/dom/shared/utils/LinkedValueUtils.js similarity index 100% rename from src/renderers/dom/client/wrappers/LinkedValueUtils.js rename to src/renderers/dom/shared/utils/LinkedValueUtils.js diff --git a/src/renderers/dom/client/utils/ViewportMetrics.js b/src/renderers/dom/shared/utils/ViewportMetrics.js similarity index 100% rename from src/renderers/dom/client/utils/ViewportMetrics.js rename to src/renderers/dom/shared/utils/ViewportMetrics.js diff --git a/src/renderers/dom/client/utils/__tests__/getEventCharCode-test.js b/src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js similarity index 100% rename from src/renderers/dom/client/utils/__tests__/getEventCharCode-test.js rename to src/renderers/dom/shared/utils/__tests__/getEventCharCode-test.js diff --git a/src/renderers/dom/client/utils/__tests__/getEventKey-test.js b/src/renderers/dom/shared/utils/__tests__/getEventKey-test.js similarity index 100% rename from src/renderers/dom/client/utils/__tests__/getEventKey-test.js rename to src/renderers/dom/shared/utils/__tests__/getEventKey-test.js diff --git a/src/renderers/dom/client/utils/__tests__/getNodeForCharacterOffset-test.js b/src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js similarity index 100% rename from src/renderers/dom/client/utils/__tests__/getNodeForCharacterOffset-test.js rename to src/renderers/dom/shared/utils/__tests__/getNodeForCharacterOffset-test.js diff --git a/src/renderers/dom/client/utils/__tests__/setInnerHTML-test.js b/src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js similarity index 100% rename from src/renderers/dom/client/utils/__tests__/setInnerHTML-test.js rename to src/renderers/dom/shared/utils/__tests__/setInnerHTML-test.js diff --git a/src/renderers/dom/client/utils/getEventCharCode.js b/src/renderers/dom/shared/utils/getEventCharCode.js similarity index 100% rename from src/renderers/dom/client/utils/getEventCharCode.js rename to src/renderers/dom/shared/utils/getEventCharCode.js diff --git a/src/renderers/dom/client/utils/getEventKey.js b/src/renderers/dom/shared/utils/getEventKey.js similarity index 100% rename from src/renderers/dom/client/utils/getEventKey.js rename to src/renderers/dom/shared/utils/getEventKey.js diff --git a/src/renderers/dom/client/utils/getEventModifierState.js b/src/renderers/dom/shared/utils/getEventModifierState.js similarity index 100% rename from src/renderers/dom/client/utils/getEventModifierState.js rename to src/renderers/dom/shared/utils/getEventModifierState.js diff --git a/src/renderers/dom/client/utils/getEventTarget.js b/src/renderers/dom/shared/utils/getEventTarget.js similarity index 100% rename from src/renderers/dom/client/utils/getEventTarget.js rename to src/renderers/dom/shared/utils/getEventTarget.js diff --git a/src/renderers/dom/client/utils/getNodeForCharacterOffset.js b/src/renderers/dom/shared/utils/getNodeForCharacterOffset.js similarity index 100% rename from src/renderers/dom/client/utils/getNodeForCharacterOffset.js rename to src/renderers/dom/shared/utils/getNodeForCharacterOffset.js diff --git a/src/renderers/dom/client/utils/getTextContentAccessor.js b/src/renderers/dom/shared/utils/getTextContentAccessor.js similarity index 100% rename from src/renderers/dom/client/utils/getTextContentAccessor.js rename to src/renderers/dom/shared/utils/getTextContentAccessor.js diff --git a/src/renderers/dom/client/utils/getVendorPrefixedEventName.js b/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js similarity index 100% rename from src/renderers/dom/client/utils/getVendorPrefixedEventName.js rename to src/renderers/dom/shared/utils/getVendorPrefixedEventName.js diff --git a/src/renderers/dom/client/utils/isEventSupported.js b/src/renderers/dom/shared/utils/isEventSupported.js similarity index 100% rename from src/renderers/dom/client/utils/isEventSupported.js rename to src/renderers/dom/shared/utils/isEventSupported.js diff --git a/src/renderers/dom/client/validateDOMNesting.js b/src/renderers/dom/shared/validateDOMNesting.js similarity index 100% rename from src/renderers/dom/client/validateDOMNesting.js rename to src/renderers/dom/shared/validateDOMNesting.js diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMIframe-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js similarity index 100% rename from src/renderers/dom/client/wrappers/__tests__/ReactDOMIframe-test.js rename to src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js similarity index 100% rename from src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js rename to src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMOption-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js similarity index 100% rename from src/renderers/dom/client/wrappers/__tests__/ReactDOMOption-test.js rename to src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js similarity index 100% rename from src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js rename to src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMTextarea-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js similarity index 100% rename from src/renderers/dom/client/wrappers/__tests__/ReactDOMTextarea-test.js rename to src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js diff --git a/src/renderers/dom/client/utils/DOMChildrenOperations.js b/src/renderers/dom/stack/client/DOMChildrenOperations.js similarity index 100% rename from src/renderers/dom/client/utils/DOMChildrenOperations.js rename to src/renderers/dom/stack/client/DOMChildrenOperations.js diff --git a/src/renderers/dom/client/utils/DOMLazyTree.js b/src/renderers/dom/stack/client/DOMLazyTree.js similarity index 100% rename from src/renderers/dom/client/utils/DOMLazyTree.js rename to src/renderers/dom/stack/client/DOMLazyTree.js diff --git a/src/renderers/dom/shared/Danger.js b/src/renderers/dom/stack/client/Danger.js similarity index 100% rename from src/renderers/dom/shared/Danger.js rename to src/renderers/dom/stack/client/Danger.js diff --git a/src/renderers/dom/shared/ReactComponentBrowserEnvironment.js b/src/renderers/dom/stack/client/ReactComponentBrowserEnvironment.js similarity index 100% rename from src/renderers/dom/shared/ReactComponentBrowserEnvironment.js rename to src/renderers/dom/stack/client/ReactComponentBrowserEnvironment.js diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/stack/client/ReactDOMComponent.js similarity index 100% rename from src/renderers/dom/shared/ReactDOMComponent.js rename to src/renderers/dom/stack/client/ReactDOMComponent.js diff --git a/src/renderers/dom/shared/ReactDOMContainerInfo.js b/src/renderers/dom/stack/client/ReactDOMContainerInfo.js similarity index 100% rename from src/renderers/dom/shared/ReactDOMContainerInfo.js rename to src/renderers/dom/stack/client/ReactDOMContainerInfo.js diff --git a/src/renderers/dom/shared/ReactDOMEmptyComponent.js b/src/renderers/dom/stack/client/ReactDOMEmptyComponent.js similarity index 100% rename from src/renderers/dom/shared/ReactDOMEmptyComponent.js rename to src/renderers/dom/stack/client/ReactDOMEmptyComponent.js diff --git a/src/renderers/dom/client/ReactDOMIDOperations.js b/src/renderers/dom/stack/client/ReactDOMIDOperations.js similarity index 100% rename from src/renderers/dom/client/ReactDOMIDOperations.js rename to src/renderers/dom/stack/client/ReactDOMIDOperations.js diff --git a/src/renderers/dom/shared/ReactDOMStackInjection.js b/src/renderers/dom/stack/client/ReactDOMStackInjection.js similarity index 100% rename from src/renderers/dom/shared/ReactDOMStackInjection.js rename to src/renderers/dom/stack/client/ReactDOMStackInjection.js diff --git a/src/renderers/dom/shared/ReactDOMTextComponent.js b/src/renderers/dom/stack/client/ReactDOMTextComponent.js similarity index 100% rename from src/renderers/dom/shared/ReactDOMTextComponent.js rename to src/renderers/dom/stack/client/ReactDOMTextComponent.js diff --git a/src/renderers/dom/client/ReactMount.js b/src/renderers/dom/stack/client/ReactMount.js similarity index 100% rename from src/renderers/dom/client/ReactMount.js rename to src/renderers/dom/stack/client/ReactMount.js diff --git a/src/renderers/dom/client/ReactReconcileTransaction.js b/src/renderers/dom/stack/client/ReactReconcileTransaction.js similarity index 100% rename from src/renderers/dom/client/ReactReconcileTransaction.js rename to src/renderers/dom/stack/client/ReactReconcileTransaction.js diff --git a/src/renderers/dom/client/__tests__/ReactDOM-test.js b/src/renderers/dom/stack/client/__tests__/ReactDOM-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactDOM-test.js rename to src/renderers/dom/stack/client/__tests__/ReactDOM-test.js diff --git a/src/renderers/dom/client/__tests__/ReactMount-test.js b/src/renderers/dom/stack/client/__tests__/ReactMount-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactMount-test.js rename to src/renderers/dom/stack/client/__tests__/ReactMount-test.js diff --git a/src/renderers/dom/client/__tests__/ReactMountDestruction-test.js b/src/renderers/dom/stack/client/__tests__/ReactMountDestruction-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactMountDestruction-test.js rename to src/renderers/dom/stack/client/__tests__/ReactMountDestruction-test.js diff --git a/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js b/src/renderers/dom/stack/client/__tests__/ReactRenderDocument-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/ReactRenderDocument-test.js rename to src/renderers/dom/stack/client/__tests__/ReactRenderDocument-test.js diff --git a/src/renderers/dom/client/__tests__/findDOMNode-test.js b/src/renderers/dom/stack/client/__tests__/findDOMNode-test.js similarity index 100% rename from src/renderers/dom/client/__tests__/findDOMNode-test.js rename to src/renderers/dom/stack/client/__tests__/findDOMNode-test.js diff --git a/src/renderers/dom/client/utils/createMicrosoftUnsafeLocalFunction.js b/src/renderers/dom/stack/client/createMicrosoftUnsafeLocalFunction.js similarity index 100% rename from src/renderers/dom/client/utils/createMicrosoftUnsafeLocalFunction.js rename to src/renderers/dom/stack/client/createMicrosoftUnsafeLocalFunction.js diff --git a/src/renderers/dom/client/findDOMNode.js b/src/renderers/dom/stack/client/findDOMNode.js similarity index 100% rename from src/renderers/dom/client/findDOMNode.js rename to src/renderers/dom/stack/client/findDOMNode.js diff --git a/src/renderers/dom/client/renderSubtreeIntoContainer.js b/src/renderers/dom/stack/client/renderSubtreeIntoContainer.js similarity index 100% rename from src/renderers/dom/client/renderSubtreeIntoContainer.js rename to src/renderers/dom/stack/client/renderSubtreeIntoContainer.js diff --git a/src/renderers/dom/client/utils/setInnerHTML.js b/src/renderers/dom/stack/client/setInnerHTML.js similarity index 100% rename from src/renderers/dom/client/utils/setInnerHTML.js rename to src/renderers/dom/stack/client/setInnerHTML.js diff --git a/src/renderers/dom/client/utils/setTextContent.js b/src/renderers/dom/stack/client/setTextContent.js similarity index 100% rename from src/renderers/dom/client/utils/setTextContent.js rename to src/renderers/dom/stack/client/setTextContent.js diff --git a/src/renderers/dom/client/wrappers/ReactDOMInput.js b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js similarity index 100% rename from src/renderers/dom/client/wrappers/ReactDOMInput.js rename to src/renderers/dom/stack/client/wrappers/ReactDOMInput.js diff --git a/src/renderers/dom/client/wrappers/ReactDOMOption.js b/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js similarity index 100% rename from src/renderers/dom/client/wrappers/ReactDOMOption.js rename to src/renderers/dom/stack/client/wrappers/ReactDOMOption.js diff --git a/src/renderers/dom/client/wrappers/ReactDOMSelect.js b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js similarity index 100% rename from src/renderers/dom/client/wrappers/ReactDOMSelect.js rename to src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js diff --git a/src/renderers/dom/client/wrappers/ReactDOMTextarea.js b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js similarity index 100% rename from src/renderers/dom/client/wrappers/ReactDOMTextarea.js rename to src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js diff --git a/src/renderers/dom/server/ReactMarkupChecksum.js b/src/renderers/dom/stack/server/ReactMarkupChecksum.js similarity index 100% rename from src/renderers/dom/server/ReactMarkupChecksum.js rename to src/renderers/dom/stack/server/ReactMarkupChecksum.js diff --git a/src/renderers/dom/server/ReactServerBatchingStrategy.js b/src/renderers/dom/stack/server/ReactServerBatchingStrategy.js similarity index 100% rename from src/renderers/dom/server/ReactServerBatchingStrategy.js rename to src/renderers/dom/stack/server/ReactServerBatchingStrategy.js diff --git a/src/renderers/dom/server/ReactServerRendering.js b/src/renderers/dom/stack/server/ReactServerRendering.js similarity index 100% rename from src/renderers/dom/server/ReactServerRendering.js rename to src/renderers/dom/stack/server/ReactServerRendering.js diff --git a/src/renderers/dom/server/ReactServerRenderingTransaction.js b/src/renderers/dom/stack/server/ReactServerRenderingTransaction.js similarity index 100% rename from src/renderers/dom/server/ReactServerRenderingTransaction.js rename to src/renderers/dom/stack/server/ReactServerRenderingTransaction.js diff --git a/src/renderers/dom/server/ReactServerUpdateQueue.js b/src/renderers/dom/stack/server/ReactServerUpdateQueue.js similarity index 100% rename from src/renderers/dom/server/ReactServerUpdateQueue.js rename to src/renderers/dom/stack/server/ReactServerUpdateQueue.js diff --git a/src/renderers/dom/server/__tests__/ReactServerRendering-test.js b/src/renderers/dom/stack/server/__tests__/ReactServerRendering-test.js similarity index 100% rename from src/renderers/dom/server/__tests__/ReactServerRendering-test.js rename to src/renderers/dom/stack/server/__tests__/ReactServerRendering-test.js diff --git a/src/renderers/shared/stack/event/EventConstants.js b/src/renderers/shared/shared/event/EventConstants.js similarity index 100% rename from src/renderers/shared/stack/event/EventConstants.js rename to src/renderers/shared/shared/event/EventConstants.js diff --git a/src/renderers/shared/stack/event/EventPluginHub.js b/src/renderers/shared/shared/event/EventPluginHub.js similarity index 100% rename from src/renderers/shared/stack/event/EventPluginHub.js rename to src/renderers/shared/shared/event/EventPluginHub.js diff --git a/src/renderers/shared/stack/event/EventPluginRegistry.js b/src/renderers/shared/shared/event/EventPluginRegistry.js similarity index 100% rename from src/renderers/shared/stack/event/EventPluginRegistry.js rename to src/renderers/shared/shared/event/EventPluginRegistry.js diff --git a/src/renderers/shared/stack/event/EventPluginUtils.js b/src/renderers/shared/shared/event/EventPluginUtils.js similarity index 100% rename from src/renderers/shared/stack/event/EventPluginUtils.js rename to src/renderers/shared/shared/event/EventPluginUtils.js diff --git a/src/renderers/shared/stack/event/EventPropagators.js b/src/renderers/shared/shared/event/EventPropagators.js similarity index 100% rename from src/renderers/shared/stack/event/EventPropagators.js rename to src/renderers/shared/shared/event/EventPropagators.js diff --git a/src/renderers/shared/stack/event/PluginModuleType.js b/src/renderers/shared/shared/event/PluginModuleType.js similarity index 100% rename from src/renderers/shared/stack/event/PluginModuleType.js rename to src/renderers/shared/shared/event/PluginModuleType.js diff --git a/src/renderers/shared/stack/reconciler/ReactEventEmitterMixin.js b/src/renderers/shared/shared/event/ReactEventEmitterMixin.js similarity index 100% rename from src/renderers/shared/stack/reconciler/ReactEventEmitterMixin.js rename to src/renderers/shared/shared/event/ReactEventEmitterMixin.js diff --git a/src/renderers/shared/stack/event/ReactSyntheticEventType.js b/src/renderers/shared/shared/event/ReactSyntheticEventType.js similarity index 100% rename from src/renderers/shared/stack/event/ReactSyntheticEventType.js rename to src/renderers/shared/shared/event/ReactSyntheticEventType.js diff --git a/src/renderers/shared/stack/event/SyntheticEvent.js b/src/renderers/shared/shared/event/SyntheticEvent.js similarity index 100% rename from src/renderers/shared/stack/event/SyntheticEvent.js rename to src/renderers/shared/shared/event/SyntheticEvent.js diff --git a/src/renderers/shared/stack/event/__tests__/EventPluginHub-test.js b/src/renderers/shared/shared/event/__tests__/EventPluginHub-test.js similarity index 100% rename from src/renderers/shared/stack/event/__tests__/EventPluginHub-test.js rename to src/renderers/shared/shared/event/__tests__/EventPluginHub-test.js diff --git a/src/renderers/shared/stack/event/__tests__/EventPluginRegistry-test.js b/src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js similarity index 100% rename from src/renderers/shared/stack/event/__tests__/EventPluginRegistry-test.js rename to src/renderers/shared/shared/event/__tests__/EventPluginRegistry-test.js diff --git a/src/renderers/shared/stack/event/eventPlugins/ResponderEventPlugin.js b/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js similarity index 100% rename from src/renderers/shared/stack/event/eventPlugins/ResponderEventPlugin.js rename to src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js diff --git a/src/renderers/shared/stack/event/eventPlugins/ResponderSyntheticEvent.js b/src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js similarity index 100% rename from src/renderers/shared/stack/event/eventPlugins/ResponderSyntheticEvent.js rename to src/renderers/shared/shared/event/eventPlugins/ResponderSyntheticEvent.js diff --git a/src/renderers/shared/stack/event/eventPlugins/ResponderTouchHistoryStore.js b/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js similarity index 100% rename from src/renderers/shared/stack/event/eventPlugins/ResponderTouchHistoryStore.js rename to src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js diff --git a/src/renderers/shared/stack/event/eventPlugins/TouchHistoryMath.js b/src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js similarity index 100% rename from src/renderers/shared/stack/event/eventPlugins/TouchHistoryMath.js rename to src/renderers/shared/shared/event/eventPlugins/TouchHistoryMath.js diff --git a/src/renderers/shared/stack/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js similarity index 100% rename from src/renderers/shared/stack/event/eventPlugins/__tests__/ResponderEventPlugin-test.js rename to src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js