@samitouri / QOS-React-2 / commits / 313611572b

Reorganize code structure (#11288)

* Move files and tests to more meaningful places * Fix the build Now that we import reconciler via react-reconciler, I needed to make a few tweaks. * Update sizes * Move @preventMunge directive to FB header * Revert unintentional change * Fix Flow coverage I forgot to @flow-ify those files. This uncovered some issues. * Prettier, I love you but you're bringing me down Prettier, I love you but you're bringing me down Like a rat in a cage Pulling minimum wage Prettier, I love you but you're bringing me down Prettier, you're safer and you're wasting my time Our records all show you were filthy but fine But they shuttered your stores When you opened the doors To the cops who were bored once they'd run out of crime Prettier, you're perfect, oh, please don't change a thing Your mild billionaire mayor's now convinced he's a king So the boring collect I mean all disrespect In the neighborhood bars I'd once dreamt I would drink Prettier, I love you but you're freaking me out There's a ton of the twist but we're fresh out of shout Like a death in the hall That you hear through your wall Prettier, I love you but you're freaking me out Prettier, I love you but you're bringing me down Prettier, I love you but you're bringing me down Like a death of the heart Jesus, where do I start? But you're still the one pool where I'd happily drown And oh! Take me off your mailing list For kids who think it still exists Yes, for those who think it still exists Maybe I'm wrong and maybe you're right Maybe I'm wrong and maybe you're right Maybe you're right, maybe I'm wrong And just maybe you're right And oh! Maybe mother told you true And there'll always be somebody there for you And you'll never be alone But maybe she's wrong and maybe I'm right And just maybe she's wrong Maybe she's wrong and maybe I'm right And if so, here's this song!

Dan Abramov committed Oct 19, 2017 at 19:50 UTC 313611572b6567d229367ed20ff63d1bca8610bb
145 files changed +193 -197
packages/react-art/index.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactARTFiberEntry');
12 +module.exports = require('./src/ReactART');
packages/react-art/src/ReactART.js renamed
+2 -3
@@ -3,9 +3,8 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 - *
7 - * @providesModule ReactARTFiberEntry
6 */
7 +
8 'use strict';
9
10 require('art/modes/current').setCurrent(
@@ -18,7 +17,7 @@ const Transform = require('art/core/transform');
17 const invariant = require('fbjs/lib/invariant');
18 const emptyObject = require('fbjs/lib/emptyObject');
19 const React = require('react');
21 -const ReactFiberReconciler = require('ReactFiberReconciler');
20 +const ReactFiberReconciler = require('react-reconciler');
21 const ReactDOMFrameScheduling = require('ReactDOMFrameScheduling');
22
23 const {Component} = React;
packages/react-cs-renderer/index.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactNativeCSFiberEntry');
12 +module.exports = require('./src/ReactNativeCS');
packages/react-cs-renderer/src/ReactNativeCS.js renamed
+1 -2
@@ -4,7 +4,6 @@
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 *
7 - * @providesModule ReactNativeCSFiberEntry
7 * @flow
8 */
9
@@ -17,7 +16,7 @@ const {injectInternals} = require('ReactFiberDevToolsHook');
16
17 import type {ReactNativeCSType} from 'ReactNativeCSTypes';
18
20 -const ReactFiberReconciler = require('ReactFiberReconciler');
19 +const ReactFiberReconciler = require('react-reconciler');
20
21 const emptyObject = require('fbjs/lib/emptyObject');
22
packages/react-dom/index.fb.js
+15 -19
@@ -7,24 +7,20 @@
7
8 'use strict';
9
10 -// TODO: Move the source into packages
11 -var ReactDOMFiber = require('ReactDOMFiberEntry');
10 +var ReactDOM = require('./src/client/ReactDOM');
11
13 -Object.assign(
14 - ReactDOMFiber.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
15 - {
16 - // These are real internal dependencies that are trickier to remove:
17 - ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'),
18 - ReactErrorUtils: require('ReactErrorUtils'),
19 - ReactFiberErrorLogger: require('ReactFiberErrorLogger'),
20 - ReactFiberTreeReflection: require('ReactFiberTreeReflection'),
21 - ReactDOMComponentTree: require('ReactDOMComponentTree'),
22 - ReactInstanceMap: require('ReactInstanceMap'),
23 - // These are dependencies of TapEventPlugin:
24 - EventPluginUtils: require('EventPluginUtils'),
25 - EventPropagators: require('EventPropagators'),
26 - SyntheticUIEvent: require('SyntheticUIEvent'),
27 - },
28 -);
12 +Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
13 + // These are real internal dependencies that are trickier to remove:
14 + ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'),
15 + ReactErrorUtils: require('ReactErrorUtils'),
16 + ReactFiberErrorLogger: require('ReactFiberErrorLogger'),
17 + ReactFiberTreeReflection: require('ReactFiberTreeReflection'),
18 + ReactDOMComponentTree: require('ReactDOMComponentTree'),
19 + ReactInstanceMap: require('ReactInstanceMap'),
20 + // These are dependencies of TapEventPlugin:
21 + EventPluginUtils: require('EventPluginUtils'),
22 + EventPropagators: require('EventPropagators'),
23 + SyntheticUIEvent: require('SyntheticUIEvent'),
24 +});
25
30 -module.exports = ReactDOMFiber;
26 +module.exports = ReactDOM;
packages/react-dom/index.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactDOMFiberEntry');
12 +module.exports = require('./src/client/ReactDOM');
packages/react-dom/server.browser.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactDOMServerBrowserEntry');
12 +module.exports = require('./src/server/ReactDOMServerBrowser');
packages/react-dom/server.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactDOMServerNodeEntry');
12 +module.exports = require('./src/server/ReactDOMServerNode');
packages/react-dom/src/__tests__/CSSPropertyOperations-test.js renamed
packages/react-dom/src/__tests__/DOMPropertyOperations-test.js renamed
packages/react-dom/src/__tests__/ReactBrowserEventEmitter-test.js renamed
packages/react-dom/src/__tests__/ReactDOM-test.js renamed
packages/react-dom/src/__tests__/ReactDOMAttribute-test.js renamed
packages/react-dom/src/__tests__/ReactDOMComponent-test.js renamed
packages/react-dom/src/__tests__/ReactDOMComponentTree-test.js renamed
packages/react-dom/src/__tests__/ReactDOMEventListener-test.js renamed
packages/react-dom/src/__tests__/ReactDOMIframe-test.js renamed
packages/react-dom/src/__tests__/ReactDOMInput-test.js renamed
packages/react-dom/src/__tests__/ReactDOMInvalidARIAHook-test.js renamed
packages/react-dom/src/__tests__/ReactDOMOption-test.js renamed
packages/react-dom/src/__tests__/ReactDOMRoot-test.js renamed
packages/react-dom/src/__tests__/ReactDOMSVG-test.js renamed
packages/react-dom/src/__tests__/ReactDOMSelect-test.js renamed
packages/react-dom/src/__tests__/ReactDOMSelection-test.js renamed
packages/react-dom/src/__tests__/ReactDOMServerIntegration-test.js renamed
packages/react-dom/src/__tests__/ReactDOMTextComponent-test.js renamed
packages/react-dom/src/__tests__/ReactDOMTextarea-test.js renamed
packages/react-dom/src/__tests__/ReactEventIndependence-test.js renamed
packages/react-dom/src/__tests__/ReactMount-test.js renamed
packages/react-dom/src/__tests__/ReactMountDestruction-test.js renamed
packages/react-dom/src/__tests__/ReactRenderDocument-test.js renamed
packages/react-dom/src/__tests__/ReactServerRendering-test.js renamed
packages/react-dom/src/__tests__/ReactServerRenderingBrowser-test.js renamed
packages/react-dom/src/__tests__/escapeTextContentForBrowser-test.js renamed
packages/react-dom/src/__tests__/findDOMNode-test.js renamed
packages/react-dom/src/__tests__/inputValueTracking-test.js renamed
packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js renamed
packages/react-dom/src/__tests__/renderSubtreeIntoContainer-test.js renamed
packages/react-dom/src/__tests__/validateDOMNesting-test.js renamed
packages/react-dom/src/client/DOMPropertyOperations.js renamed
packages/react-dom/src/client/ReactBrowserEventEmitter.js renamed
packages/react-dom/src/client/ReactDOM.js renamed
+3 -4
@@ -4,7 +4,6 @@
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 *
7 - * @providesModule ReactDOMFiberEntry
7 * @flow
8 */
9
@@ -22,7 +21,7 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');
21 var ReactDOMFiberComponent = require('ReactDOMFiberComponent');
22 var ReactDOMFrameScheduling = require('ReactDOMFrameScheduling');
23 var ReactGenericBatching = require('ReactGenericBatching');
25 -var ReactFiberReconciler = require('ReactFiberReconciler');
24 +var ReactFiberReconciler = require('react-reconciler');
25 var ReactInputSelection = require('ReactInputSelection');
26 var ReactInstanceMap = require('ReactInstanceMap');
27 var ReactPortal = require('ReactPortal');
@@ -784,7 +783,7 @@ ReactRoot.prototype.unmount = function(callback) {
783 DOMRenderer.updateContainer(null, root, null, callback);
784 };
785
787 -var ReactDOMFiber = {
786 +var ReactDOM = {
787 createRoot(container: DOMContainer, options?: RootOptions): ReactRootNode {
788 const hydrate = options != null && options.hydrate === true;
789 return new ReactRoot(container, hydrate);
@@ -988,4 +987,4 @@ if (__DEV__) {
987 }
988 }
989
991 -module.exports = ReactDOMFiber;
990 +module.exports = ReactDOM;
packages/react-dom/src/client/ReactDOMClientInjection.js renamed
packages/react-dom/src/client/ReactDOMComponentTree.js renamed
packages/react-dom/src/client/ReactDOMEventListener.js renamed
packages/react-dom/src/client/ReactDOMFiberComponent.js renamed
packages/react-dom/src/client/ReactDOMFiberInput.js renamed
packages/react-dom/src/client/ReactDOMFiberOption.js renamed
packages/react-dom/src/client/ReactDOMFiberSelect.js renamed
packages/react-dom/src/client/ReactDOMFiberTextarea.js renamed
packages/react-dom/src/client/ReactDOMSelection.js renamed
packages/react-dom/src/client/ReactInputSelection.js renamed
packages/react-dom/src/client/eventPlugins/BeforeInputEventPlugin.js renamed
packages/react-dom/src/client/eventPlugins/ChangeEventPlugin.js renamed
packages/react-dom/src/client/eventPlugins/DOMEventPluginOrder.js renamed
packages/react-dom/src/client/eventPlugins/EnterLeaveEventPlugin.js renamed
packages/react-dom/src/client/eventPlugins/FallbackCompositionState.js renamed
packages/react-dom/src/client/eventPlugins/SelectEventPlugin.js renamed
packages/react-dom/src/client/eventPlugins/SimpleEventPlugin.js renamed
packages/react-dom/src/client/eventPlugins/TapEventPlugin.js renamed
packages/react-dom/src/client/eventPlugins/__tests__/BeforeInputEventPlugin-test.js renamed
packages/react-dom/src/client/eventPlugins/__tests__/ChangeEventPlugin-test.js renamed
packages/react-dom/src/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js renamed
packages/react-dom/src/client/eventPlugins/__tests__/FallbackCompositionState-test.js renamed
packages/react-dom/src/client/eventPlugins/__tests__/SelectEventPlugin-test.js renamed
packages/react-dom/src/client/eventPlugins/__tests__/SimpleEventPlugin-test.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticAnimationEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticClipboardEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticCompositionEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticDragEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticFocusEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticInputEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticKeyboardEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticMouseEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticTouchEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticTransitionEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticUIEvent.js renamed
packages/react-dom/src/client/syntheticEvents/SyntheticWheelEvent.js renamed
packages/react-dom/src/client/syntheticEvents/__tests__/SyntheticClipboardEvent-test.js renamed
packages/react-dom/src/client/syntheticEvents/__tests__/SyntheticEvent-test.js renamed
packages/react-dom/src/client/syntheticEvents/__tests__/SyntheticKeyboardEvent-test.js renamed
packages/react-dom/src/client/syntheticEvents/__tests__/SyntheticWheelEvent-test.js renamed
packages/react-dom/src/client/utils/__tests__/getEventCharCode-test.js renamed
packages/react-dom/src/client/utils/__tests__/getEventKey-test.js renamed
packages/react-dom/src/client/utils/__tests__/getNodeForCharacterOffset-test.js renamed
packages/react-dom/src/client/utils/__tests__/setInnerHTML-test.js renamed
packages/react-dom/src/client/utils/getEventCharCode.js renamed
packages/react-dom/src/client/utils/getEventKey.js renamed
packages/react-dom/src/client/utils/getEventModifierState.js renamed
packages/react-dom/src/client/utils/getEventTarget.js renamed
packages/react-dom/src/client/utils/getNodeForCharacterOffset.js renamed
packages/react-dom/src/client/utils/getTextContentAccessor.js renamed
packages/react-dom/src/client/utils/inputValueTracking.js renamed
packages/react-dom/src/client/utils/isEventSupported.js renamed
packages/react-dom/src/client/utils/setInnerHTML.js renamed
packages/react-dom/src/client/utils/setTextContent.js renamed
packages/react-dom/src/client/utils/validateDOMNesting.js renamed
packages/react-dom/src/server/DOMMarkupOperations.js renamed
packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js renamed
packages/react-dom/src/server/ReactDOMServerBrowser.js renamed
-2
@@ -3,8 +3,6 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 - *
7 - * @providesModule ReactDOMServerBrowserEntry
6 */
7
8 'use strict';
packages/react-dom/src/server/ReactDOMServerNode.js renamed
-2
@@ -3,8 +3,6 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 - *
7 - * @providesModule ReactDOMServerNodeEntry
6 */
7
8 'use strict';
packages/react-dom/src/server/ReactDOMStringRenderer.js renamed
packages/react-dom/src/shared/renderSubtreeIntoContainer.js deleted
-14
@@ -1,14 +0,0 @@
1 -/**
2 - * Copyright (c) 2013-present, Facebook, Inc.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @providesModule renderSubtreeIntoContainer
8 - */
9 -
10 -'use strict';
11 -
12 -var ReactDOM = require('ReactDOM');
13 -
14 -module.exports = ReactDOM.unstable_renderSubtreeIntoContainer;
packages/react-dom/src/shared/utils/AutoFocusUtils.js deleted
-22
@@ -1,22 +0,0 @@
1 -/**
2 - * Copyright (c) 2013-present, Facebook, Inc.
3 - *
4 - * This source code is licensed under the MIT license found in the
5 - * LICENSE file in the root directory of this source tree.
6 - *
7 - * @providesModule AutoFocusUtils
8 - */
9 -
10 -'use strict';
11 -
12 -var ReactDOMComponentTree = require('ReactDOMComponentTree');
13 -
14 -var focusNode = require('fbjs/lib/focusNode');
15 -
16 -var AutoFocusUtils = {
17 - focusDOMComponent: function() {
18 - focusNode(ReactDOMComponentTree.getNodeFromInstance(this));
19 - },
20 -};
21 -
22 -module.exports = AutoFocusUtils;
packages/react-dom/src/shared/utils/checkReact.js renamed
packages/react-dom/src/shared/utils/createMicrosoftUnsafeLocalFunction.js renamed
packages/react-dom/src/shared/utils/dangerousStyleValue.js renamed
packages/react-dom/src/shared/utils/escapeTextContentForBrowser.js renamed
packages/react-dom/src/shared/utils/quoteAttributeValueForBrowser.js renamed
packages/react-dom/src/shared/utils/warnValidStyle.js renamed
packages/react-dom/src/test-utils/ReactTestUtils.js renamed
-2
@@ -3,8 +3,6 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 - *
7 - * @providesModule ReactTestUtilsEntry
6 */
7
8 'use strict';
packages/react-dom/src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies.js renamed
+1 -2
@@ -3,14 +3,13 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 - *
7 - * @providesModule ReactDOMUnstableNativeDependenciesEntry
6 */
7
8 const EventPluginUtils = require('EventPluginUtils');
9 const ResponderEventPlugin = require('ResponderEventPlugin');
10 const ResponderTouchHistoryStore = require('ResponderTouchHistoryStore');
11
12 +// This is used by react-native-web.
13 const ReactDOMUnstableNativeDependencies = {
14 injectComponentTree: EventPluginUtils.injection.injectComponentTree,
15 ResponderEventPlugin,
packages/react-dom/test-utils.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactTestUtilsEntry');
12 +module.exports = require('./src/test-utils/ReactTestUtils');
packages/react-dom/unstable-native-dependencies.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactDOMUnstableNativeDependenciesEntry');
12 +module.exports = require('./src/unstable-native-dependencies/ReactDOMUnstableNativeDependencies');
packages/react-native-renderer/index.js
+3 -2
@@ -3,9 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -// TODO: This package is a lie. Maybe rename to react-native-renderer?
11 -module.exports = require('./src/ReactNativeFiberEntry');
12 +module.exports = require('./src/ReactNativeRenderer');
packages/react-native-renderer/src/ReactNativeFiberHostComponent.js
-1
@@ -6,7 +6,6 @@
6 *
7 * @providesModule ReactNativeFiberHostComponent
8 * @flow
9 - * @preventMunge
9 */
10
11 'use strict';
packages/react-native-renderer/src/ReactNativeFiberRenderer.js
+1 -1
@@ -10,7 +10,7 @@
10
11 'use strict';
12
13 -const ReactFiberReconciler = require('ReactFiberReconciler');
13 +const ReactFiberReconciler = require('react-reconciler');
14 const ReactNativeAttributePayload = require('ReactNativeAttributePayload');
15 const ReactNativeComponentTree = require('ReactNativeComponentTree');
16 const ReactNativeFiberHostComponent = require('ReactNativeFiberHostComponent');
packages/react-native-renderer/src/ReactNativeRenderer.js renamed
+4 -5
@@ -4,7 +4,6 @@
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 *
7 - * @providesModule ReactNativeFiberEntry
7 * @flow
8 */
9
@@ -41,7 +40,7 @@ ReactFiberErrorLogger.injection.injectDialog(
40 ReactNativeFiberErrorDialog.showDialog,
41 );
42
44 -const ReactNativeFiber: ReactNativeType = {
43 +const ReactNativeRenderer: ReactNativeType = {
44 NativeComponent: require('ReactNativeComponent'),
45
46 findNodeHandle: findNumericNodeHandle,
@@ -71,7 +70,7 @@ const ReactNativeFiber: ReactNativeType = {
70 },
71
72 unmountComponentAtNodeAndRemoveContainer(containerTag: number) {
74 - ReactNativeFiber.unmountComponentAtNode(containerTag);
73 + ReactNativeRenderer.unmountComponentAtNode(containerTag);
74
75 // Call back into native to remove all of the subviews from this container
76 UIManager.removeRootView(containerTag);
@@ -107,7 +106,7 @@ const ReactNativeFiber: ReactNativeType = {
106 if (__DEV__) {
107 // $FlowFixMe
108 Object.assign(
110 - ReactNativeFiber.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
109 + ReactNativeRenderer.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
110 {
111 // TODO: none of these work since Fiber. Remove these dependencies.
112 // Used by RCTRenderingPerf, Systrace:
@@ -136,4 +135,4 @@ injectInternals({
135 rendererPackageName: 'react-native-renderer',
136 });
137
139 -module.exports = ReactNativeFiber;
138 +module.exports = ReactNativeRenderer;
packages/react-noop-renderer/index.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactNoopEntry');
12 +module.exports = require('./src/ReactNoop');
packages/react-noop-renderer/src/ReactNoop.js renamed
+2 -2
@@ -4,7 +4,7 @@
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 *
7 - * @providesModule ReactNoopEntry
7 + * @providesModule ReactNoop
8 * @flow
9 */
10
@@ -22,7 +22,7 @@ import type {UpdateQueue} from 'ReactFiberUpdateQueue';
22
23 var ReactFeatureFlags = require('ReactFeatureFlags');
24 var ReactFiberInstrumentation = require('ReactFiberInstrumentation');
25 -var ReactFiberReconciler = require('ReactFiberReconciler');
25 +var ReactFiberReconciler = require('react-reconciler');
26 var ReactInstanceMap = require('ReactInstanceMap');
27 var emptyObject = require('fbjs/lib/emptyObject');
28
packages/react-reconciler/index.js
+9
@@ -3,8 +3,17 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
12 +// TODO: bundle Flow types with the package.
13 +export type {
14 + HostConfig,
15 + Deadline,
16 + Reconciler,
17 +} from './src/ReactFiberReconciler';
18 +
19 module.exports = require('./src/ReactFiberReconciler');
packages/react-reconciler/src/ReactFiberBeginWork.js
+1 -1
@@ -10,12 +10,12 @@
10
11 'use strict';
12
13 +import type {HostConfig} from 'react-reconciler';
14 import type {ReactCoroutine} from 'ReactTypes';
15 import type {Fiber} from 'ReactFiber';
16 import type {HostContext} from 'ReactFiberHostContext';
17 import type {HydrationContext} from 'ReactFiberHydrationContext';
18 import type {FiberRoot} from 'ReactFiberRoot';
18 -import type {HostConfig} from 'ReactFiberReconciler';
19 import type {ExpirationTime} from 'ReactFiberExpirationTime';
20
21 var {
packages/react-reconciler/src/ReactFiberCommitWork.js
+1 -1
@@ -10,8 +10,8 @@
10
11 'use strict';
12
13 +import type {HostConfig} from 'react-reconciler';
14 import type {Fiber} from 'ReactFiber';
14 -import type {HostConfig} from 'ReactFiberReconciler';
15
16 var ReactFeatureFlags = require('ReactFeatureFlags');
17 var ReactTypeOfWork = require('ReactTypeOfWork');
packages/react-reconciler/src/ReactFiberCompleteWork.js
+1 -1
@@ -10,13 +10,13 @@
10
11 'use strict';
12
13 +import type {HostConfig} from 'react-reconciler';
14 import type {ReactCoroutine} from 'ReactTypes';
15 import type {Fiber} from 'ReactFiber';
16 import type {ExpirationTime} from 'ReactFiberExpirationTime';
17 import type {HostContext} from 'ReactFiberHostContext';
18 import type {HydrationContext} from 'ReactFiberHydrationContext';
19 import type {FiberRoot} from 'ReactFiberRoot';
19 -import type {HostConfig} from 'ReactFiberReconciler';
20
21 var {reconcileChildFibers} = require('ReactChildFiber');
22 var {
packages/react-reconciler/src/ReactFiberHostContext.js
+1 -1
@@ -10,8 +10,8 @@
10
11 'use strict';
12
13 +import type {HostConfig} from 'react-reconciler';
14 import type {Fiber} from 'ReactFiber';
14 -import type {HostConfig} from 'ReactFiberReconciler';
15 import type {StackCursor} from 'ReactFiberStack';
16
17 const {createCursor, pop, push} = require('ReactFiberStack');
packages/react-reconciler/src/ReactFiberHydrationContext.js
+1 -1
@@ -10,8 +10,8 @@
10
11 'use strict';
12
13 +import type {HostConfig} from 'react-reconciler';
14 import type {Fiber} from 'ReactFiber';
14 -import type {HostConfig} from 'ReactFiberReconciler';
15
16 var invariant = require('fbjs/lib/invariant');
17
packages/react-reconciler/src/ReactFiberReconciler.js
-1
@@ -4,7 +4,6 @@
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 *
7 - * @providesModule ReactFiberReconciler
7 * @flow
8 */
9
packages/react-reconciler/src/ReactFiberScheduler.js
+1 -1
@@ -10,9 +10,9 @@
10
11 'use strict';
12
13 +import type {HostConfig, Deadline} from 'react-reconciler';
14 import type {Fiber} from 'ReactFiber';
15 import type {FiberRoot} from 'ReactFiberRoot';
15 -import type {HostConfig, Deadline} from 'ReactFiberReconciler';
16 import type {HydrationContext} from 'ReactFiberHydrationContext';
17 import type {ExpirationTime} from 'ReactFiberExpirationTime';
18
packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js
+1 -1
@@ -17,7 +17,7 @@ describe('ReactFiberHostContext', () => {
17 jest.resetModules();
18 React = require('react');
19 // TODO: can we express this test with only public API?
20 - ReactFiberReconciler = require('ReactFiberReconciler');
20 + ReactFiberReconciler = require('react-reconciler');
21 });
22
23 it('works with null host context', () => {
packages/react-reconciler/src/__tests__/ReactIncrementalTriangle-test.js
+1 -1
@@ -16,7 +16,7 @@ describe('ReactIncrementalTriangle', () => {
16 beforeEach(() => {
17 jest.resetModules();
18 React = require('react');
19 - ReactNoop = require('ReactNoopEntry');
19 + ReactNoop = require('react-noop-renderer');
20 });
21
22 function span(prop) {
packages/react-rt-renderer/index.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactNativeRTFiberEntry');
12 +module.exports = require('./src/ReactNativeRT');
packages/react-rt-renderer/src/ReactNativeRT.js renamed
packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js
+1 -1
@@ -10,7 +10,7 @@
10
11 'use strict';
12
13 -const ReactFiberReconciler = require('ReactFiberReconciler');
13 +const ReactFiberReconciler = require('react-reconciler');
14 const ReactNativeRTComponentTree = require('ReactNativeRTComponentTree');
15 const ReactNativeRTTagHandles = require('ReactNativeRTTagHandles');
16 const RTManager = require('RTManager');
packages/react-test-renderer/index.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactTestRendererFiberEntry');
12 +module.exports = require('./src/ReactTestRenderer');
packages/react-test-renderer/shallow.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactShallowRendererEntry');
12 +module.exports = require('./src/ReactShallowRenderer');
packages/react-test-renderer/src/ReactShallowRenderer.js renamed
-2
@@ -4,8 +4,6 @@
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 *
7 - * @providesModule ReactShallowRendererEntry
8 - * @preventMunge
7 */
8
9 'use strict';
packages/react-test-renderer/src/ReactTestRenderer.js renamed
+1 -3
@@ -4,14 +4,12 @@
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 *
7 - * @providesModule ReactTestRendererFiberEntry
8 - * @preventMunge
7 * @flow
8 */
9
10 'use strict';
11
14 -var ReactFiberReconciler = require('ReactFiberReconciler');
12 +var ReactFiberReconciler = require('react-reconciler');
13 var ReactFiberTreeReflection = require('ReactFiberTreeReflection');
14 var ReactGenericBatching = require('ReactGenericBatching');
15 var emptyObject = require('fbjs/lib/emptyObject');
packages/react/index.js
+3 -1
@@ -3,8 +3,10 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 + *
7 + * @flow
8 */
9
10 'use strict';
11
10 -module.exports = require('./src/ReactEntry');
12 +module.exports = require('./src/React');
packages/react/src/React.js renamed
-2
@@ -3,8 +3,6 @@
3 *
4 * This source code is licensed under the MIT license found in the
5 * LICENSE file in the root directory of this source tree.
6 - *
7 - * @providesModule ReactEntry
6 */
7
8 'use strict';
packages/shared/src/ReactDOMFrameScheduling.js
+1 -1
@@ -18,7 +18,7 @@
18 // layout, paint and other browser work is counted against the available time.
19 // The frame rate is dynamically adjusted.
20
21 -import type {Deadline} from 'ReactFiberReconciler';
21 +import type {Deadline} from 'react-reconciler';
22
23 var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
24
scripts/rollup/bundles.js
+10 -2
@@ -23,11 +23,17 @@ const RN_PROD = bundleTypes.RN_PROD;
23 const moduleTypes = {
24 ISOMORPHIC: 'ISOMORPHIC',
25 RENDERER: 'RENDERER',
26 + RENDERER_UTILS: 'RENDERER_UTILS',
27 RECONCILER: 'RECONCILER',
28 };
29
30 +// React
31 const ISOMORPHIC = moduleTypes.ISOMORPHIC;
32 +// Individual renderers. They bundle the reconciler. (e.g. ReactDOM)
33 const RENDERER = moduleTypes.RENDERER;
34 +// Helper packages that access specific renderer's internals. (e.g. TestUtils)
35 +const RENDERER_UTILS = moduleTypes.RENDERER_UTILS;
36 +// Standalone reconciler for third-party renderers.
37 const RECONCILER = moduleTypes.RECONCILER;
38
39 const babelOptsReact = {
@@ -114,7 +120,7 @@ const bundles = [
120 ],
121 fbEntry: 'packages/react-dom/test-utils.js',
122 hasteName: 'ReactTestUtils',
117 - moduleType: RENDERER,
123 + moduleType: RENDERER_UTILS,
124 label: 'test-utils',
125 manglePropertiesOnProd: false,
126 name: 'react-dom/test-utils',
@@ -142,7 +148,7 @@ const bundles = [
148 ],
149 fbEntry: 'packages/react-dom/unstable-native-dependencies.js',
150 hasteName: 'ReactDOMUnstableNativeDependencies',
145 - moduleType: RENDERER,
151 + moduleType: RENDERER_UTILS,
152 label: 'dom-unstable-native-dependencies',
153 manglePropertiesOnProd: false,
154 name: 'react-dom/unstable-native-dependencies',
@@ -281,6 +287,7 @@ const bundles = [
287 'prop-types/checkPropTypes',
288 ],
289 hasteName: 'ReactNativeRTFiber',
290 + moduleType: RENDERER,
291 isRenderer: true,
292 label: 'native-rt-fiber',
293 manglePropertiesOnProd: false,
@@ -305,6 +312,7 @@ const bundles = [
312 entry: 'packages/react-cs-renderer/index.js',
313 externals: ['prop-types/checkPropTypes'],
314 hasteName: 'ReactNativeCSFiber',
315 + moduleType: RENDERER,
316 isRenderer: true,
317 label: 'native-cs-fiber',
318 manglePropertiesOnProd: false,
scripts/rollup/header.js
+1
@@ -9,6 +9,7 @@ function getProvidesHeader(hasteFinalName) {
9 *
10 * @noflow
11 * @providesModule ${hasteFinalName}
12 + * @preventMunge
13 */
14 `;
15 }
scripts/rollup/modules.js
+15 -3
@@ -23,6 +23,7 @@ const RN_DEV = bundleTypes.RN_DEV;
23 const RN_PROD = bundleTypes.RN_PROD;
24
25 const ISOMORPHIC = moduleTypes.ISOMORPHIC;
26 +const RENDERER = moduleTypes.RENDERER;
27
28 const errorCodeOpts = {
29 errorMapFilePath: 'scripts/error-codes/codes.json',
@@ -122,6 +123,10 @@ function getNodeModules(bundleType, moduleType) {
123
124 function ignoreFBModules() {
125 return [
126 + // These are FB-specific aliases to react and react-dom.
127 + // Don't attempt to bundle them into other bundles.
128 + 'React',
129 + 'ReactDOM',
130 // At FB, we don't know them statically:
131 'ReactFeatureFlags',
132 // In FB bundles, we preserve an inline require to ReactCurrentOwner.
@@ -180,14 +185,21 @@ function getExternalModules(externals, bundleType, moduleType) {
185 return externalModules;
186 }
187
183 -function getInternalModules() {
188 +function getInternalModules(moduleType) {
189 // we tell Rollup where these files are located internally, otherwise
190 // it doesn't pick them up and assumes they're external
186 - return {
191 + let aliases = {
192 reactProdInvariant: resolve(
193 './packages/shared/src/utils/reactProdInvariant.js'
194 ),
195 };
196 + if (moduleType === RENDERER) {
197 + // Renderers bundle the whole reconciler.
198 + aliases['react-reconciler'] = resolve(
199 + './packages/react-reconciler/index.js'
200 + );
201 + }
202 + return aliases;
203 }
204
205 function getFbjsModuleAliases(bundleType) {
@@ -292,7 +304,7 @@ function getAliases(paths, bundleType, moduleType, extractErrors) {
304 extractErrors && extractErrorCodes(errorCodeOpts),
305 bundleType
306 ),
295 - getInternalModules(),
307 + getInternalModules(moduleType),
308 getNodeModules(bundleType, moduleType),
309 getFbjsModuleAliases(bundleType)
310 );
scripts/rollup/packaging.js
+1 -1
@@ -19,7 +19,7 @@ const RN_PROD = Bundles.bundleTypes.RN_PROD;
19 const facebookWWW = 'facebook-www';
20 // these files need to be copied to the facebook-www build
21 const facebookWWWSrcDependencies = [
22 - 'packages/react-dom/src/shared/eventPlugins/TapEventPlugin.js',
22 + 'packages/react-dom/src/client/eventPlugins/TapEventPlugin.js',
23 ];
24
25 // these files need to be copied to the react-native build
scripts/rollup/results.json
+78 -78
@@ -1,71 +1,71 @@
1 {
2 "bundleSizes": {
3 "react.development.js (UMD_DEV)": {
4 - "size": 54809,
5 - "gzip": 14353
4 + "size": 54803,
5 + "gzip": 14350
6 },
7 "react.production.min.js (UMD_PROD)": {
8 "size": 6634,
9 "gzip": 2764
10 },
11 "react.development.js (NODE_DEV)": {
12 - "size": 45713,
13 - "gzip": 12098
12 + "size": 45707,
13 + "gzip": 12095
14 },
15 "react.production.min.js (NODE_PROD)": {
16 "size": 5611,
17 "gzip": 2364
18 },
19 "React-dev.js (FB_DEV)": {
20 - "size": 43022,
21 - "gzip": 11328
20 + "size": 43016,
21 + "gzip": 11325
22 },
23 "React-prod.js (FB_PROD)": {
24 - "size": 24837,
25 - "gzip": 6709
24 + "size": 24831,
25 + "gzip": 6707
26 },
27 "react-dom.development.js (UMD_DEV)": {
28 - "size": 632002,
29 - "gzip": 144937
28 + "size": 631104,
29 + "gzip": 144685
30 },
31 "react-dom.production.min.js (UMD_PROD)": {
32 - "size": 100474,
33 - "gzip": 31680
32 + "size": 100038,
33 + "gzip": 31532
34 },
35 "react-dom.development.js (NODE_DEV)": {
36 - "size": 594283,
37 - "gzip": 136223
36 + "size": 593383,
37 + "gzip": 135883
38 },
39 "react-dom.production.min.js (NODE_PROD)": {
40 - "size": 107016,
41 - "gzip": 33539
40 + "size": 106647,
41 + "gzip": 33435
42 },
43 "ReactDOMFiber-dev.js (FB_DEV)": {
44 - "size": 591222,
45 - "gzip": 135569
44 + "size": 590572,
45 + "gzip": 135237
46 },
47 "ReactDOMFiber-prod.js (FB_PROD)": {
48 - "size": 421158,
49 - "gzip": 93551
48 + "size": 419911,
49 + "gzip": 93354
50 },
51 "react-dom-test-utils.development.js (NODE_DEV)": {
52 - "size": 41688,
53 - "gzip": 11099
52 + "size": 41743,
53 + "gzip": 11118
54 },
55 "ReactTestUtils-dev.js (FB_DEV)": {
56 - "size": 41250,
57 - "gzip": 11033
56 + "size": 41569,
57 + "gzip": 11069
58 },
59 "react-dom-unstable-native-dependencies.development.js (UMD_DEV)": {
60 - "size": 84992,
61 - "gzip": 21295
60 + "size": 84961,
61 + "gzip": 21296
62 },
63 "react-dom-unstable-native-dependencies.production.min.js (UMD_PROD)": {
64 "size": 14441,
65 "gzip": 4650
66 },
67 "react-dom-unstable-native-dependencies.development.js (NODE_DEV)": {
68 - "size": 80785,
68 + "size": 80754,
69 "gzip": 19972
70 },
71 "react-dom-unstable-native-dependencies.production.min.js (NODE_PROD)": {
@@ -73,96 +73,96 @@
73 "gzip": 4510
74 },
75 "ReactDOMUnstableNativeDependencies-dev.js (FB_DEV)": {
76 - "size": 80222,
77 - "gzip": 19873
76 + "size": 80190,
77 + "gzip": 19882
78 },
79 "ReactDOMUnstableNativeDependencies-prod.js (FB_PROD)": {
80 - "size": 65170,
81 - "gzip": 15532
80 + "size": 65164,
81 + "gzip": 15538
82 },
83 "react-dom-server.browser.development.js (UMD_DEV)": {
84 - "size": 130213,
85 - "gzip": 33601
84 + "size": 124910,
85 + "gzip": 32260
86 },
87 "react-dom-server.browser.production.min.js (UMD_PROD)": {
88 - "size": 15134,
89 - "gzip": 5909
88 + "size": 15345,
89 + "gzip": 5968
90 },
91 "react-dom-server.browser.development.js (NODE_DEV)": {
92 - "size": 100133,
93 - "gzip": 26461
92 + "size": 94830,
93 + "gzip": 25139
94 },
95 "react-dom-server.browser.production.min.js (NODE_PROD)": {
96 - "size": 15038,
97 - "gzip": 5882
96 + "size": 15071,
97 + "gzip": 5902
98 },
99 "ReactDOMServer-dev.js (FB_DEV)": {
100 - "size": 99554,
101 - "gzip": 26365
100 + "size": 94490,
101 + "gzip": 25063
102 },
103 "ReactDOMServer-prod.js (FB_PROD)": {
104 - "size": 42690,
105 - "gzip": 11892
104 + "size": 42454,
105 + "gzip": 11844
106 },
107 "react-dom-server.node.development.js (NODE_DEV)": {
108 - "size": 102395,
109 - "gzip": 27013
108 + "size": 97092,
109 + "gzip": 25688
110 },
111 "react-dom-server.node.production.min.js (NODE_PROD)": {
112 - "size": 15963,
113 - "gzip": 6214
112 + "size": 15996,
113 + "gzip": 6238
114 },
115 "react-art.development.js (UMD_DEV)": {
116 - "size": 378343,
117 - "gzip": 83009
116 + "size": 378408,
117 + "gzip": 83017
118 },
119 "react-art.production.min.js (UMD_PROD)": {
120 "size": 82432,
121 "gzip": 25592
122 },
123 "react-art.development.js (NODE_DEV)": {
124 - "size": 302698,
125 - "gzip": 63826
124 + "size": 302763,
125 + "gzip": 63846
126 },
127 "react-art.production.min.js (NODE_PROD)": {
128 "size": 53897,
129 "gzip": 16869
130 },
131 "ReactARTFiber-dev.js (FB_DEV)": {
132 - "size": 301301,
133 - "gzip": 63733
132 + "size": 301605,
133 + "gzip": 63774
134 },
135 "ReactARTFiber-prod.js (FB_PROD)": {
136 - "size": 225462,
137 - "gzip": 46449
136 + "size": 225472,
137 + "gzip": 46455
138 },
139 "ReactNativeFiber-dev.js (RN_DEV)": {
140 - "size": 285864,
141 - "gzip": 49285
140 + "size": 285948,
141 + "gzip": 49225
142 },
143 "ReactNativeFiber-prod.js (RN_PROD)": {
144 - "size": 223648,
145 - "gzip": 38454
144 + "size": 223676,
145 + "gzip": 38463
146 },
147 "react-test-renderer.development.js (NODE_DEV)": {
148 - "size": 306386,
149 - "gzip": 64218
148 + "size": 306451,
149 + "gzip": 64239
150 },
151 "ReactTestRendererFiber-dev.js (FB_DEV)": {
152 - "size": 304979,
153 - "gzip": 64135
152 + "size": 305254,
153 + "gzip": 64170
154 },
155 "react-test-renderer-shallow.development.js (NODE_DEV)": {
156 - "size": 9370,
157 - "gzip": 2338
156 + "size": 9364,
157 + "gzip": 2335
158 },
159 "ReactShallowRenderer-dev.js (FB_DEV)": {
160 - "size": 9027,
161 - "gzip": 2253
160 + "size": 9020,
161 + "gzip": 2254
162 },
163 "react-noop-renderer.development.js (NODE_DEV)": {
164 - "size": 295594,
165 - "gzip": 61405
164 + "size": 295660,
165 + "gzip": 61436
166 },
167 "react-dom-server.development.js (UMD_DEV)": {
168 "size": 120897,
@@ -189,11 +189,11 @@
189 "gzip": 7520
190 },
191 "ReactNativeRTFiber-dev.js (RN_DEV)": {
192 - "size": 217767,
193 - "gzip": 36738
192 + "size": 217811,
193 + "gzip": 36735
194 },
195 "ReactNativeRTFiber-prod.js (RN_PROD)": {
196 - "size": 165326,
196 + "size": 165325,
197 "gzip": 27464
198 },
199 "react-test-renderer.production.min.js (NODE_PROD)": {
@@ -209,20 +209,20 @@
209 "gzip": 4241
210 },
211 "react-reconciler.development.js (NODE_DEV)": {
212 - "size": 281271,
213 - "gzip": 58283
212 + "size": 281332,
213 + "gzip": 58301
214 },
215 "react-reconciler.production.min.js (NODE_PROD)": {
216 "size": 37658,
217 "gzip": 11762
218 },
219 "ReactNativeCSFiber-dev.js (RN_DEV)": {
220 - "size": 210188,
221 - "gzip": 34969
220 + "size": 210232,
221 + "gzip": 34986
222 },
223 "ReactNativeCSFiber-prod.js (RN_PROD)": {
224 - "size": 160321,
225 - "gzip": 26276
224 + "size": 160320,
225 + "gzip": 26275
226 }
227 }
228 }
\ No newline at end of file