providesModule -> explicit requires for cross-package dependencies (#9078)

gulpfile.js

+32 -15

@@ -103,35 +103,52 @@ var paths = {

103 },

104 };

105

106 -var moduleMapBase = Object.assign(

107 - {'object-assign': 'object-assign'},

108 - require('fbjs/module-map')

109 -);

106 +var moduleMapBase = {'object-assign': 'object-assign'};

107 +

108 +var fbjsModules = require('fbjs/module-map');

109 +for (var key in fbjsModules) {

110 + var path = fbjsModules[key];

111 + moduleMapBase[path] = path;

112 +}

113

114 var moduleMapReact = Object.assign(

115 {

116 // Addons needs to reach into DOM internals

114 - ReactDOM: 'react-dom/lib/ReactDOM',

115 - ReactInstanceMap: 'react-dom/lib/ReactInstanceMap',

116 - ReactTestUtils: 'react-dom/lib/ReactTestUtils',

117 - ReactPerf: 'react-dom/lib/ReactPerf',

118 - getVendorPrefixedEventName: 'react-dom/lib/getVendorPrefixedEventName',

117 + 'react-dom': 'react-dom',

118 + 'react-dom/lib/ReactInstanceMap': 'react-dom/lib/ReactInstanceMap',

119 + 'react-dom/lib/ReactTestUtils': 'react-dom/lib/ReactTestUtils',

120 + 'react-dom/lib/ReactPerf': 'react-dom/lib/ReactPerf',

121 + 'react-dom/lib/getVendorPrefixedEventName': 'react-dom/lib/getVendorPrefixedEventName',

122 +

123 + // Alias

124 + 'react': './React',

125 + // Shared state

126 + 'react/lib/ReactCurrentOwner': './ReactCurrentOwner',

127 + 'react/lib/checkPropTypes': './checkPropTypes',

128 + 'react/lib/ReactComponentTreeHook': './ReactComponentTreeHook',

129 + 'react/lib/ReactDebugCurrentFrame': './ReactDebugCurrentFrame',

130 },

131 moduleMapBase

132 );

133

134 var rendererSharedState = {

135 // Alias

125 - React: 'react/lib/React',

136 + 'react': 'react/lib/React',

137 // Shared state

127 - ReactCurrentOwner: 'react/lib/ReactCurrentOwner',

128 - checkPropTypes: 'react/lib/checkPropTypes',

129 - ReactComponentTreeHook: 'react/lib/ReactComponentTreeHook',

130 - ReactDebugCurrentFrame: 'react/lib/ReactDebugCurrentFrame',

138 + 'react/lib/ReactCurrentOwner': 'react/lib/ReactCurrentOwner',

139 + 'react/lib/checkPropTypes': 'react/lib/checkPropTypes',

140 + 'react/lib/ReactComponentTreeHook': 'react/lib/ReactComponentTreeHook',

141 + 'react/lib/ReactDebugCurrentFrame': 'react/lib/ReactDebugCurrentFrame',

142 };

143

144 var moduleMapReactDOM = Object.assign(

134 - {},

145 + {

146 + 'react-dom': './ReactDOM',

147 + 'react-dom/lib/ReactInstanceMap': './ReactInstanceMap',

148 + 'react-dom/lib/ReactTestUtils': './ReactTestUtils',

149 + 'react-dom/lib/ReactPerf': './ReactPerf',

150 + 'react-dom/lib/getVendorPrefixedEventName': './getVendorPrefixedEventName',

151 + },

152 rendererSharedState,

153 moduleMapBase

154 );

src/addons/ReactAddonsDOMDependencies.js

+3 -3

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var ReactDOM = require('ReactDOM');

14 +var ReactDOM = require('react-dom');

15

16 exports.getReactDOM = function() {

17 return ReactDOM;

@@ -23,14 +23,14 @@ if (__DEV__) {

23

24 exports.getReactPerf = function() {

25 if (!ReactPerf) {

26 - ReactPerf = require('ReactPerf');

26 + ReactPerf = require('react-dom/lib/ReactPerf');

27 }

28 return ReactPerf;

29 };

30

31 exports.getReactTestUtils = function() {

32 if (!ReactTestUtils) {

33 - ReactTestUtils = require('ReactTestUtils');

33 + ReactTestUtils = require('react-dom/lib/ReactTestUtils');

34 }

35 return ReactTestUtils;

36 };

src/addons/ReactFragment.js

+3 -3

@@ -14,9 +14,9 @@

14 var ReactChildren = require('ReactChildren');

15 var ReactElement = require('ReactElement');

16

17 -var emptyFunction = require('emptyFunction');

18 -var invariant = require('invariant');

19 -var warning = require('warning');

17 +var emptyFunction = require('fbjs/lib/emptyFunction');

18 +var invariant = require('fbjs/lib/invariant');

19 +var warning = require('fbjs/lib/warning');

20

21 /**

22 * We used to allow keyed objects to serve as a collection of ReactElements,

src/addons/ReactWithAddons.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactAddonsDOMDependencies = require('ReactAddonsDOMDependencies');

16 var ReactComponentWithPureRenderMixin =

17 require('ReactComponentWithPureRenderMixin');

src/addons/__tests__/ReactComponentWithPureRenderMixin-test.js

+1 -1

@@ -18,7 +18,7 @@ var ReactTestUtils;

18 describe('ReactComponentWithPureRenderMixin', () => {

19

20 beforeEach(() => {

21 - React = require('React');

21 + React = require('react');

22 ReactComponentWithPureRenderMixin =

23 require('ReactComponentWithPureRenderMixin');

24 ReactTestUtils = require('ReactTestUtils');

src/addons/__tests__/ReactFragment-test.js

+2 -2

@@ -18,8 +18,8 @@ var ReactFragment;

18 describe('ReactFragment', () => {

19

20 beforeEach(() => {

21 - React = require('React');

22 - ReactDOM = require('ReactDOM');

21 + React = require('react');

22 + ReactDOM = require('react-dom');

23 ReactFragment = require('ReactFragment');

24 });

25

src/addons/__tests__/renderSubtreeIntoContainer-test.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16 var ReactTestUtils = require('ReactTestUtils');

17 var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');

18

src/addons/shallowCompare.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var shallowEqual = require('shallowEqual');

14 +var shallowEqual = require('fbjs/lib/shallowEqual');

15

16 /**

17 * Does a shallow comparison for props and state.

src/addons/transitions/ReactCSSTransitionGroup.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15

16 var ReactTransitionGroup = require('ReactTransitionGroup');

17 var ReactCSSTransitionGroupChild = require('ReactCSSTransitionGroupChild');

src/addons/transitions/ReactCSSTransitionGroupChild.js

+2 -2

@@ -11,10 +11,10 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactAddonsDOMDependencies = require('ReactAddonsDOMDependencies');

16

17 -var CSSCore = require('CSSCore');

17 +var CSSCore = require('fbjs/lib/CSSCore');

18 var ReactTransitionEvents = require('ReactTransitionEvents');

19

20 var onlyChild = require('onlyChild');

src/addons/transitions/ReactTransitionEvents.js

+2 -2

@@ -11,9 +11,9 @@

11

12 'use strict';

13

14 -var ExecutionEnvironment = require('ExecutionEnvironment');

14 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

15

16 -var getVendorPrefixedEventName = require('getVendorPrefixedEventName');

16 +var getVendorPrefixedEventName = require('react-dom/lib/getVendorPrefixedEventName');

17

18 var endEvents = [];

19

src/addons/transitions/ReactTransitionGroup.js

+2 -2

@@ -11,10 +11,10 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactTransitionChildMapping = require('ReactTransitionChildMapping');

16

17 -var emptyFunction = require('emptyFunction');

17 +var emptyFunction = require('fbjs/lib/emptyFunction');

18

19 /**

20 * A basis for animations. When children are declaratively added or removed,

src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js

+3 -3

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var CSSCore = require('CSSCore');

14 +var CSSCore = require('fbjs/lib/CSSCore');

15

16 var React;

17 var ReactDOM;

@@ -24,8 +24,8 @@ describe('ReactCSSTransitionGroup', () => {

24

25 beforeEach(() => {

26 jest.resetModules();

27 - React = require('React');

28 - ReactDOM = require('ReactDOM');

27 + React = require('react');

28 + ReactDOM = require('react-dom');

29 ReactCSSTransitionGroup = require('ReactCSSTransitionGroup');

30

31 container = document.createElement('div');

src/addons/transitions/__tests__/ReactTransitionChildMapping-test.js

+1 -1

@@ -16,7 +16,7 @@ var ReactTransitionChildMapping;

16

17 describe('ReactTransitionChildMapping', () => {

18 beforeEach(() => {

19 - React = require('React');

19 + React = require('react');

20 ReactTransitionChildMapping = require('ReactTransitionChildMapping');

21 });

22

src/addons/transitions/__tests__/ReactTransitionGroup-test.js

+2 -2

@@ -21,8 +21,8 @@ describe('ReactTransitionGroup', () => {

21 var container;

22

23 beforeEach(() => {

24 - React = require('React');

25 - ReactDOM = require('ReactDOM');

24 + React = require('react');

25 + ReactDOM = require('react-dom');

26 ReactTransitionGroup = require('ReactTransitionGroup');

27

28 container = document.createElement('div');

src/addons/update.js

+1 -1

@@ -13,7 +13,7 @@

13

14 'use strict';

15

16 -var invariant = require('invariant');

16 +var invariant = require('fbjs/lib/invariant');

17 var hasOwnProperty = {}.hasOwnProperty;

18

19 function shallowCopy(x) {

src/isomorphic/React.js

+1 -1

@@ -20,7 +20,7 @@ var ReactPropTypes = require('ReactPropTypes');

20 var ReactVersion = require('ReactVersion');

21

22 var onlyChild = require('onlyChild');

23 -var warning = require('warning');

23 +var warning = require('fbjs/lib/warning');

24 var checkPropTypes = require('checkPropTypes');

25

26 var createElement = ReactElement.createElement;

src/isomorphic/__tests__/React-test.js

+1 -1

@@ -16,7 +16,7 @@ describe('React', () => {

16 var React;

17

18 beforeEach(() => {

19 - React = require('React');

19 + React = require('react');

20 });

21

22 it('should log a deprecation warning once when using React.createMixin', () => {

src/isomorphic/children/ReactChildren.js

+1 -1

@@ -14,7 +14,7 @@

14 var PooledClass = require('PooledClass');

15 var ReactElement = require('ReactElement');

16

17 -var emptyFunction = require('emptyFunction');

17 +var emptyFunction = require('fbjs/lib/emptyFunction');

18 var traverseAllChildren = require('traverseAllChildren');

19

20 var twoArgumentPooler = PooledClass.twoArgumentPooler;

src/isomorphic/children/__tests__/ReactChildren-test.js

+1 -1

@@ -17,7 +17,7 @@ describe('ReactChildren', () => {

17

18 beforeEach(() => {

19 jest.resetModules();

20 - React = require('React');

20 + React = require('react');

21 ReactFragment = require('ReactFragment');

22 });

23

src/isomorphic/children/__tests__/onlyChild-test.js

+1 -1

@@ -19,7 +19,7 @@ describe('onlyChild', () => {

19 var WrapComponent;

20

21 beforeEach(() => {

22 - React = require('React');

22 + React = require('react');

23 ReactFragment = require('ReactFragment');

24 onlyChild = require('onlyChild');

25 WrapComponent = class extends React.Component {

src/isomorphic/children/__tests__/sliceChildren-test.js

+1 -1

@@ -18,7 +18,7 @@ describe('sliceChildren', () => {

18 var sliceChildren;

19

20 beforeEach(() => {

21 - React = require('React');

21 + React = require('react');

22

23 sliceChildren = require('sliceChildren');

24 });

src/isomorphic/children/onlyChild.js

+1 -1

@@ -12,7 +12,7 @@

12

13 var ReactElement = require('ReactElement');

14

15 -var invariant = require('invariant');

15 +var invariant = require('fbjs/lib/invariant');

16

17 /**

18 * Returns the first child in a collection of children and verifies that there

src/isomorphic/classic/__tests__/ReactContextValidator-test.js

+2 -2

@@ -29,8 +29,8 @@ describe('ReactContextValidator', () => {

29 beforeEach(() => {

30 jest.resetModules();

31

32 - React = require('React');

33 - ReactDOM = require('ReactDOM');

32 + React = require('react');

33 + ReactDOM = require('react-dom');

34 ReactTestUtils = require('ReactTestUtils');

35 });

36

src/isomorphic/classic/class/ReactClass.js

+3 -3

@@ -15,9 +15,9 @@ var ReactBaseClasses = require('ReactBaseClasses');

15 var ReactElement = require('ReactElement');

16 var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');

17

18 -var emptyObject = require('emptyObject');

19 -var invariant = require('invariant');

20 -var warning = require('warning');

18 +var emptyObject = require('fbjs/lib/emptyObject');

19 +var invariant = require('fbjs/lib/invariant');

20 +var warning = require('fbjs/lib/warning');

21

22 var ReactComponent = ReactBaseClasses.Component;

23

src/isomorphic/classic/class/__tests__/ReactBind-test.js

+1 -1

@@ -11,7 +11,7 @@

11 /*global global:true*/

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactTestUtils = require('ReactTestUtils');

16

17 // TODO: Test render and all stock methods.

src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js

+1 -1

@@ -11,7 +11,7 @@

11 /*global global:true*/

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactTestUtils = require('ReactTestUtils');

16

17 // TODO: Test render and all stock methods.

src/isomorphic/classic/class/__tests__/ReactClass-test.js

+2 -2

@@ -18,8 +18,8 @@ var ReactTestUtils;

18 describe('ReactClass-spec', () => {

19

20 beforeEach(() => {

21 - React = require('React');

22 - ReactDOM = require('ReactDOM');

21 + React = require('react');

22 + ReactDOM = require('react-dom');

23 ReactTestUtils = require('ReactTestUtils');

24 });

25

src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js

+1 -1

@@ -23,7 +23,7 @@ var componentPropValidator;

23 describe('ReactClass-mixin', () => {

24

25 beforeEach(() => {

26 - React = require('React');

26 + React = require('react');

27 ReactTestUtils = require('ReactTestUtils');

28 mixinPropValidator = jest.fn();

29 componentPropValidator = jest.fn();

src/isomorphic/classic/element/ReactElement.js

+1 -1

@@ -13,7 +13,7 @@

13

14 var ReactCurrentOwner = require('ReactCurrentOwner');

15

16 -var warning = require('warning');

16 +var warning = require('fbjs/lib/warning');

17 var canDefineProperty = require('canDefineProperty');

18 var hasOwnProperty = Object.prototype.hasOwnProperty;

19

src/isomorphic/classic/element/ReactElementValidator.js

+1 -1

@@ -29,7 +29,7 @@ var getComponentName = require('getComponentName');

29 var getIteratorFn = require('getIteratorFn');

30

31 if (__DEV__) {

32 - var warning = require('warning');

32 + var warning = require('fbjs/lib/warning');

33 var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');

34 }

35

src/isomorphic/classic/element/__tests__/ReactElement-test.js

+5 -5

@@ -28,8 +28,8 @@ describe('ReactElement', () => {

28 originalSymbol = global.Symbol;

29 global.Symbol = undefined;

30

31 - React = require('React');

32 - ReactDOM = require('ReactDOM');

31 + React = require('react');

32 + ReactDOM = require('react-dom');

33 ReactTestUtils = require('ReactTestUtils');

34 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

35 // NOTE: We're explicitly not using JSX here. This is intended to test

@@ -502,7 +502,7 @@ describe('ReactElement', () => {

502

503 jest.resetModules();

504

505 - React = require('React');

505 + React = require('react');

506

507 var Component = React.createClass({

508 render: function() {

@@ -534,8 +534,8 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {

534

535 beforeEach(() => {

536 jest.resetModules();

537 - React = require('React');

538 - ReactDOM = require('ReactDOM');

537 + React = require('react');

538 + ReactDOM = require('react-dom');

539 ReactTestUtils = require('ReactTestUtils');

540 Child = jest.genMockFromModule('ReactElementTestChild');

541 });

src/isomorphic/classic/element/__tests__/ReactElementClone-test.js

+2 -2

@@ -19,8 +19,8 @@ describe('ReactElementClone', () => {

19 var ComponentClass;

20

21 beforeEach(() => {

22 - React = require('React');

23 - ReactDOM = require('ReactDOM');

22 + React = require('react');

23 + ReactDOM = require('react-dom');

24 ReactTestUtils = require('ReactTestUtils');

25

26 // NOTE: We're explicitly not using JSX here. This is intended to test

src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js

+2 -2

@@ -28,8 +28,8 @@ describe('ReactElementValidator', () => {

28 beforeEach(() => {

29 jest.resetModules();

30

31 - React = require('React');

32 - ReactDOM = require('ReactDOM');

31 + React = require('react');

32 + ReactDOM = require('react-dom');

33 ReactTestUtils = require('ReactTestUtils');

34 ComponentClass = React.createClass({

35 render: function() {

src/isomorphic/classic/types/ReactPropTypes.js

+3 -3

@@ -14,10 +14,10 @@

14 var ReactElement = require('ReactElement');

15 var ReactPropTypesSecret = require('ReactPropTypesSecret');

16

17 -var emptyFunction = require('emptyFunction');

17 +var emptyFunction = require('fbjs/lib/emptyFunction');

18 var getIteratorFn = require('getIteratorFn');

19 -var invariant = require('invariant');

20 -var warning = require('warning');

19 +var invariant = require('fbjs/lib/invariant');

20 +var warning = require('fbjs/lib/warning');

21

22 /**

23 * Collection of methods that allow declaration and validation of props that are

src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js

+2 -2

@@ -110,8 +110,8 @@ function expectWarningInDevelopment(declaration, value) {

110 describe('ReactPropTypes', () => {

111 beforeEach(() => {

112 PropTypes = require('ReactPropTypes');

113 - React = require('React');

114 - ReactDOM = require('ReactDOM');

113 + React = require('react');

114 + ReactDOM = require('react-dom');

115 ReactFragment = require('ReactFragment');

116 resetWarningCache();

117 });

src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js

+1 -1

@@ -30,7 +30,7 @@ describe('ReactPropTypesProduction', function() {

30

31 jest.resetModules();

32 PropTypes = require('ReactPropTypes');

33 - React = require('React');

33 + React = require('react');

34 ReactTestUtils = require('ReactTestUtils');

35 });

36

src/isomorphic/classic/types/checkPropTypes.js

+2 -2

@@ -13,8 +13,8 @@

13

14 var ReactPropTypesSecret = require('ReactPropTypesSecret');

15

16 -var invariant = require('invariant');

17 -var warning = require('warning');

16 +var invariant = require('fbjs/lib/invariant');

17 +var warning = require('fbjs/lib/warning');

18

19 var loggedTypeFailures = {};

20

src/isomorphic/hooks/ReactComponentTreeHook.js

+2 -2

@@ -22,8 +22,8 @@ var {

22 } = ReactTypeOfWork;

23

24 var getComponentName = require('getComponentName');

25 -var invariant = require('invariant');

26 -var warning = require('warning');

25 +var invariant = require('fbjs/lib/invariant');

26 +var warning = require('fbjs/lib/warning');

27

28 import type { ReactElement, Source } from 'ReactElementType';

29 import type { DebugID } from 'ReactInstanceType';

src/isomorphic/modern/class/React.d.ts

+1 -1

@@ -14,7 +14,7 @@

14 * just helpers for the unit test.

15 */

16

17 -declare module 'React' {

17 +declare module 'react' {

18 export class Component {

19 props: any;

20 state: any;

src/isomorphic/modern/class/ReactBaseClasses.js

+3 -3

@@ -14,9 +14,9 @@

14 var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');

15

16 var canDefineProperty = require('canDefineProperty');

17 -var emptyObject = require('emptyObject');

18 -var invariant = require('invariant');

19 -var warning = require('warning');

17 +var emptyObject = require('fbjs/lib/emptyObject');

18 +var invariant = require('fbjs/lib/invariant');

19 +var warning = require('fbjs/lib/warning');

20

21 /**

22 * Base class helpers for the updating state of a component.

src/isomorphic/modern/class/ReactDOM.d.ts

+1 -1

@@ -14,7 +14,7 @@

14 * just helpers for the unit test.

15 */

16

17 -declare module 'ReactDOM' {

17 +declare module 'react-dom' {

18 export function render(element : any, container : any) : any

19 export function unmountComponentAtNode(container : any) : void

20 export function findDOMNode(instance : any) : any

src/isomorphic/modern/class/ReactNoopUpdateQueue.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var warning = require('warning');

14 +var warning = require('fbjs/lib/warning');

15

16 function warnNoop(publicInstance, callerName) {

17 if (__DEV__) {

src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee

+2 -2

@@ -19,8 +19,8 @@ describe 'ReactCoffeeScriptClass', ->

19 renderedName = null;

20

21 beforeEach ->

22 - React = require 'React'

23 - ReactDOM = require 'ReactDOM'

22 + React = require 'react'

23 + ReactDOM = require 'react-dom'

24 container = document.createElement 'div'

25 attachedListener = null

26 renderedName = null

src/isomorphic/modern/class/__tests__/ReactES6Class-test.js

+2 -2

@@ -26,8 +26,8 @@ describe('ReactES6Class', () => {

26 var renderedName = null;

27

28 beforeEach(() => {

29 - React = require('React');

30 - ReactDOM = require('ReactDOM');

29 + React = require('react');

30 + ReactDOM = require('react-dom');

31 container = document.createElement('div');

32 attachedListener = null;

33 renderedName = null;

src/isomorphic/modern/class/__tests__/ReactPureComponent-test.js

+2 -2

@@ -16,8 +16,8 @@ var ReactDOM;

16

17 describe('ReactPureComponent', () => {

18 beforeEach(() => {

19 - React = require('React');

20 - ReactDOM = require('ReactDOM');

19 + React = require('react');

20 + ReactDOM = require('react-dom');

21 });

22

23 it('should render', () => {

src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts

+2 -2

@@ -10,8 +10,8 @@

10 * of patent rights can be found in the PATENTS file in the same directory.

11 */

12

13 -import React = require('React');

14 -import ReactDOM = require('ReactDOM');

13 +import React = require('react');

14 +import ReactDOM = require('react-dom');

15

16 // Before Each

17

src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js

+2 -2

@@ -21,8 +21,8 @@ describe('ReactJSXElement', () => {

21 beforeEach(() => {

22 jest.resetModules();

23

24 - React = require('React');

25 - ReactDOM = require('ReactDOM');

24 + React = require('react');

25 + ReactDOM = require('react-dom');

26 ReactTestUtils = require('ReactTestUtils');

27 Component = class extends React.Component {

28 render() {

src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js

+2 -2

@@ -29,8 +29,8 @@ describe('ReactJSXElementValidator', () => {

29 beforeEach(() => {

30 jest.resetModules();

31

32 - React = require('React');

33 - ReactDOM = require('ReactDOM');

32 + React = require('react');

33 + ReactDOM = require('react-dom');

34 ReactTestUtils = require('ReactTestUtils');

35

36 Component = class extends React.Component {

src/node_modules/README.md new

+3

@@ -0,0 +1,3 @@

1 +# Forwarding Modules

2 +

3 +This directory defines modules that normally exist on npm but replaces them with forwarding modules that point to our internal providesModule files.

src/node_modules/react-dom/index.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactDOM');

src/node_modules/react-dom/lib/ReactDOM.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactDOM');

src/node_modules/react-dom/lib/ReactDOMServer.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactDOMServer');

src/node_modules/react-dom/lib/ReactInstanceMap.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactInstanceMap');

src/node_modules/react-dom/lib/ReactPerf.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactPerf');

src/node_modules/react-dom/lib/ReactTestUtils.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactTestUtils');

src/node_modules/react-dom/lib/getVendorPrefixedEventName.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('getVendorPrefixedEventName');

src/node_modules/react-dom/server.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactDOMServer');

src/node_modules/react/index.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('React');

src/node_modules/react/lib/ReactComponentTreeHook.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactComponentTreeHook');

src/node_modules/react/lib/ReactCurrentOwner.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactCurrentOwner');

src/node_modules/react/lib/ReactDebugCurrentFrame.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('ReactDebugCurrentFrame');

src/node_modules/react/lib/checkPropTypes.js new

+9

@@ -0,0 +1,9 @@

1 +/**

2 + * Copyright 2016-present Facebook. All Rights Reserved.

3 + *

4 + * @flow

5 + */

6 +

7 +'use strict';

8 +

9 +module.exports = require('checkPropTypes');

src/renderers/__tests__/EventPluginHub-test.js

+1 -1

@@ -19,7 +19,7 @@ describe('EventPluginHub', () => {

19

20 beforeEach(() => {

21 jest.resetModules();

22 - React = require('React');

22 + React = require('react');

23 ReactTestUtils = require('ReactTestUtils');

24 });

25

src/renderers/__tests__/ReactChildReconciler-test.js

+1 -1

@@ -25,7 +25,7 @@ describe('ReactChildReconciler', () => {

25 beforeEach(() => {

26 jest.resetModules();

27

28 - React = require('React');

28 + React = require('react');

29 ReactTestUtils = require('ReactTestUtils');

30 });

31

src/renderers/__tests__/ReactComponent-test.js

+2 -2

@@ -18,8 +18,8 @@ var ReactTestUtils;

18

19 describe('ReactComponent', () => {

20 beforeEach(() => {

21 - React = require('React');

22 - ReactDOM = require('ReactDOM');

21 + React = require('react');

22 + ReactDOM = require('react-dom');

23 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

24 ReactTestUtils = require('ReactTestUtils');

25 });

src/renderers/__tests__/ReactComponentLifeCycle-test.js

+2 -2

@@ -92,8 +92,8 @@ function getLifeCycleState(instance): ComponentLifeCycle {

92 describe('ReactComponentLifeCycle', () => {

93 beforeEach(() => {

94 jest.resetModules();

95 - React = require('React');

96 - ReactDOM = require('ReactDOM');

95 + React = require('react');

96 + ReactDOM = require('react-dom');

97 ReactTestUtils = require('ReactTestUtils');

98 });

99

src/renderers/__tests__/ReactComponentTreeHook-test.js

+8 -8

@@ -22,11 +22,11 @@ describe('ReactComponentTreeHook', () => {

22 beforeEach(() => {

23 jest.resetModules();

24

25 - React = require('React');

26 - ReactDOM = require('ReactDOM');

27 - ReactDOMServer = require('ReactDOMServer');

25 + React = require('react');

26 + ReactDOM = require('react-dom');

27 + ReactDOMServer = require('react-dom/server');

28 ReactInstanceMap = require('ReactInstanceMap');

29 - ReactComponentTreeHook = require('ReactComponentTreeHook');

29 + ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

30 ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');

31 });

32

@@ -1886,11 +1886,11 @@ describe('ReactComponentTreeHook', () => {

1886

1887 jest.resetModules();

1888

1889 - React = require('React');

1890 - ReactDOM = require('ReactDOM');

1891 - ReactDOMServer = require('ReactDOMServer');

1889 + React = require('react');

1890 + ReactDOM = require('react-dom');

1891 + ReactDOMServer = require('react-dom/server');

1892 ReactInstanceMap = require('ReactInstanceMap');

1893 - ReactComponentTreeHook = require('ReactComponentTreeHook');

1893 + ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

1894 ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');

1895 });

1896

src/renderers/__tests__/ReactComponentTreeHook-test.native.js

+2 -2

@@ -25,10 +25,10 @@ describe('ReactComponentTreeHook', () => {

25 beforeEach(() => {

26 jest.resetModules();

27

28 - React = require('React');

28 + React = require('react');

29 ReactNative = require('ReactNative');

30 ReactInstanceMap = require('ReactInstanceMap');

31 - ReactComponentTreeHook = require('ReactComponentTreeHook');

31 + ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

32 ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');

33 View = require('View');

34 createReactNativeComponentClass = require('createReactNativeComponentClass');

src/renderers/__tests__/ReactCompositeComponent-test.js

+4 -4

@@ -25,11 +25,11 @@ describe('ReactCompositeComponent', () => {

25

26 beforeEach(() => {

27 jest.resetModules();

28 - React = require('React');

29 - ReactDOM = require('ReactDOM');

28 + React = require('react');

29 + ReactDOM = require('react-dom');

30 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

31 - ReactDOMServer = require('ReactDOMServer');

32 - ReactCurrentOwner = require('ReactCurrentOwner');

31 + ReactDOMServer = require('react-dom/server');

32 + ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

33 ReactPropTypes = require('ReactPropTypes');

34 ReactTestUtils = require('ReactTestUtils');

35

src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js

+2 -2

@@ -30,8 +30,8 @@ var expectSingleChildlessDiv;

30 describe('ReactCompositeComponentDOMMinimalism', () => {

31

32 beforeEach(() => {

33 - React = require('React');

34 - ReactDOM = require('ReactDOM');

33 + React = require('react');

34 + ReactDOM = require('react-dom');

35 ReactTestUtils = require('ReactTestUtils');

36

37 LowerLevelComposite = class extends React.Component {

src/renderers/__tests__/ReactCompositeComponentNestedState-test.js

+2 -2

@@ -18,8 +18,8 @@ var ReactTestUtils;

18 describe('ReactCompositeComponentNestedState-state', () => {

19

20 beforeEach(() => {

21 - React = require('React');

22 - ReactDOM = require('ReactDOM');

21 + React = require('react');

22 + ReactDOM = require('react-dom');

23 ReactTestUtils = require('ReactTestUtils');

24 });

25

src/renderers/__tests__/ReactCompositeComponentState-test.js

+2 -2

@@ -20,9 +20,9 @@ var TestComponent;

20 describe('ReactCompositeComponent-state', () => {

21

22 beforeEach(() => {

23 - React = require('React');

23 + React = require('react');

24

25 - ReactDOM = require('ReactDOM');

25 + ReactDOM = require('react-dom');

26 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

27

28 TestComponent = React.createClass({

src/renderers/__tests__/ReactEmptyComponent-test.js

+2 -2

@@ -23,8 +23,8 @@ describe('ReactEmptyComponent', () => {

23 beforeEach(() => {

24 jest.resetModules();

25

26 - React = require('React');

27 - ReactDOM = require('ReactDOM');

26 + React = require('react');

27 + ReactDOM = require('react-dom');

28 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

29 ReactTestUtils = require('ReactTestUtils');

30

src/renderers/__tests__/ReactErrorBoundaries-test.js

+2 -2

@@ -37,8 +37,8 @@ describe('ReactErrorBoundaries', () => {

37 var Normal;

38

39 beforeEach(() => {

40 - ReactDOM = require('ReactDOM');

41 - React = require('React');

40 + ReactDOM = require('react-dom');

41 + React = require('react');

42

43 log = [];

44

src/renderers/__tests__/ReactHostOperationHistoryHook-test.js

+3 -3

@@ -22,9 +22,9 @@ describe('ReactHostOperationHistoryHook', () => {

22 beforeEach(() => {

23 jest.resetModules();

24

25 - React = require('React');

26 - ReactPerf = require('ReactPerf');

27 - ReactDOM = require('ReactDOM');

25 + React = require('react');

26 + ReactPerf = require('react-dom/lib/ReactPerf');

27 + ReactDOM = require('react-dom');

28 ReactDOMComponentTree = require('ReactDOMComponentTree');

29 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

30 ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook');

src/renderers/__tests__/ReactIdentity-test.js

+2 -2

@@ -20,8 +20,8 @@ describe('ReactIdentity', () => {

20

21 beforeEach(() => {

22 jest.resetModules();

23 - React = require('React');

24 - ReactDOM = require('ReactDOM');

23 + React = require('react');

24 + ReactDOM = require('react-dom');

25 ReactFragment = require('ReactFragment');

26 ReactTestUtils = require('ReactTestUtils');

27 });

src/renderers/__tests__/ReactMockedComponent-test.js

+1 -1

@@ -20,7 +20,7 @@ var MockedComponent;

20 describe('ReactMockedComponent', () => {

21

22 beforeEach(() => {

23 - React = require('React');

23 + React = require('react');

24 ReactTestUtils = require('ReactTestUtils');

25

26 AutoMockedComponent = jest.genMockFromModule('ReactMockedComponentTestComponent');

src/renderers/__tests__/ReactMultiChild-test.js

+2 -2

@@ -22,8 +22,8 @@ describe('ReactMultiChild', () => {

22

23 beforeEach(() => {

24 jest.resetModules();

25 - React = require('React');

26 - ReactDOM = require('ReactDOM');

25 + React = require('react');

26 + ReactDOM = require('react-dom');

27 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

28 });

29

src/renderers/__tests__/ReactMultiChildReconcile-test.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16

17 var stripEmptyValues = function(obj) {

18 var ret = {};

src/renderers/__tests__/ReactMultiChildText-test.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

17 var ReactTestUtils = require('ReactTestUtils');

18

src/renderers/__tests__/ReactPerf-test.js

+4 -4

@@ -34,11 +34,11 @@ describe('ReactPerf', () => {

34 console.table.isFake = true;

35 }

36

37 - React = require('React');

38 - ReactDOM = require('ReactDOM');

39 - ReactPerf = require('ReactPerf');

37 + React = require('react');

38 + ReactDOM = require('react-dom');

39 + ReactPerf = require('react-dom/lib/ReactPerf');

40 ReactTestUtils = require('ReactTestUtils');

41 - emptyFunction = require('emptyFunction');

41 + emptyFunction = require('fbjs/lib/emptyFunction');

42

43 App = class extends React.Component {

44 render() {

src/renderers/__tests__/ReactStateSetters-test.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactStateSetters = require('ReactStateSetters');

16 var ReactTestUtils = require('ReactTestUtils');

17

src/renderers/__tests__/ReactStatelessComponent-test.js

+2 -2

@@ -28,8 +28,8 @@ describe('ReactStatelessComponent', () => {

28

29 beforeEach(() => {

30 jest.resetModuleRegistry();

31 - React = require('React');

32 - ReactDOM = require('ReactDOM');

31 + React = require('react');

32 + ReactDOM = require('react-dom');

33 ReactTestUtils = require('ReactTestUtils');

34 });

35

src/renderers/__tests__/ReactTreeTraversal-test.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactDOMComponentTree = require('ReactDOMComponentTree');

16 var ReactTestUtils = require('ReactTestUtils');

17

src/renderers/__tests__/ReactUpdates-test.js

+2 -2

@@ -19,8 +19,8 @@ var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

19

20 describe('ReactUpdates', () => {

21 beforeEach(() => {

22 - React = require('React');

23 - ReactDOM = require('ReactDOM');

22 + React = require('react');

23 + ReactDOM = require('react-dom');

24 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

25 ReactTestUtils = require('ReactTestUtils');

26 ReactUpdates = require('ReactUpdates');

src/renderers/__tests__/refs-destruction-test.js

+2 -2

@@ -21,8 +21,8 @@ describe('refs-destruction', () => {

21 beforeEach(() => {

22 jest.resetModules();

23

24 - React = require('React');

25 - ReactDOM = require('ReactDOM');

24 + React = require('react');

25 + ReactDOM = require('react-dom');

26 ReactTestUtils = require('ReactTestUtils');

27

28 TestComponent = class extends React.Component {

src/renderers/__tests__/refs-test.js

+8 -8

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

16 var ReactTestUtils = require('ReactTestUtils');

17

@@ -112,7 +112,7 @@ var expectClickLogsLengthToBe = function(instance, length) {

112 describe('reactiverefs', () => {

113 beforeEach(() => {

114 jest.resetModules();

115 - React = require('React');

115 + React = require('react');

116 ReactTestUtils = require('ReactTestUtils');

117 });

118

@@ -169,7 +169,7 @@ describe('ref swapping', () => {

169 let RefHopsAround;

170 beforeEach(() => {

171 jest.resetModules();

172 - React = require('React');

172 + React = require('react');

173 ReactTestUtils = require('ReactTestUtils');

174

175 RefHopsAround = class extends React.Component {

@@ -305,14 +305,14 @@ describe('ref swapping', () => {

305 describe('string refs between fiber and stack', () => {

306 beforeEach(() => {

307 jest.resetModules();

308 - React = require('React');

308 + React = require('react');

309 ReactTestUtils = require('ReactTestUtils');

310 });

311

312 it('attaches, detaches from fiber component with stack layer', () => {

313 spyOn(console, 'error');

314 - const ReactCurrentOwner = require('ReactCurrentOwner');

315 - const ReactDOM = require('ReactDOM');

314 + const ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

315 + const ReactDOM = require('react-dom');

316 const ReactDOMFiber = require('ReactDOMFiber');

317 const ReactInstanceMap = require('ReactInstanceMap');

318 let layerMounted = false;

@@ -358,8 +358,8 @@ describe('string refs between fiber and stack', () => {

358

359 it('attaches, detaches from stack component with fiber layer', () => {

360 spyOn(console, 'error');

361 - const ReactCurrentOwner = require('ReactCurrentOwner');

362 - const ReactDOM = require('ReactDOM');

361 + const ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

362 + const ReactDOM = require('react-dom');

363 const ReactDOMFiber = require('ReactDOMFiber');

364 const ReactInstanceMap = require('ReactInstanceMap');

365 let layerMounted = false;

src/renderers/art/ReactARTFiber.js

+2 -2

@@ -18,8 +18,8 @@ require('art/modes/current').setCurrent(

18 const Mode = require('art/modes/current');

19 const Transform = require('art/core/transform');

20 const invariant = require('fbjs/lib/invariant');

21 -const emptyObject = require('emptyObject');

22 -const React = require('React');

21 +const emptyObject = require('fbjs/lib/emptyObject');

22 +const React = require('react');

23 const ReactFiberReconciler = require('ReactFiberReconciler');

24 const ReactDOMFrameScheduling = require('ReactDOMFrameScheduling');

25

src/renderers/art/ReactARTStack.js

+4 -4

@@ -18,14 +18,14 @@ require('art/modes/current').setCurrent(

18 const Transform = require('art/core/transform');

19 const Mode = require('art/modes/current');

20

21 -const React = require('React');

22 -const ReactDOM = require('ReactDOM');

21 +const React = require('react');

22 +const ReactDOM = require('react-dom');

23 const ReactInstanceMap = require('ReactInstanceMap');

24 const ReactMultiChild = require('ReactMultiChild');

25 const ReactUpdates = require('ReactUpdates');

26

27 -const emptyObject = require('emptyObject');

28 -const invariant = require('invariant');

27 +const emptyObject = require('fbjs/lib/emptyObject');

28 +const invariant = require('fbjs/lib/invariant');

29

30 const assign = require('object-assign');

31 const pooledTransform = new Transform();

src/renderers/art/__tests__/ReactART-test.js

+2 -2

@@ -13,8 +13,8 @@

13

14 'use strict';

15

16 -var React = require('React');

17 -var ReactDOM = require('ReactDOM');

16 +var React = require('react');

17 +var ReactDOM = require('react-dom');

18 var ReactTestUtils = require('ReactTestUtils');

19

20 var Group;

src/renderers/dom/ReactDOM.js

+2 -2

@@ -23,7 +23,7 @@ var ReactVersion = require('ReactVersion');

23

24 var findDOMNode = require('findDOMNode');

25 var getHostComponentFromComposite = require('getHostComponentFromComposite');

26 -var warning = require('warning');

26 +var warning = require('fbjs/lib/warning');

27

28 ReactDOMInjection.inject();

29 ReactDOMStackInjection.inject();

@@ -67,7 +67,7 @@ if (

67 }

68

69 if (__DEV__) {

70 - var ExecutionEnvironment = require('ExecutionEnvironment');

70 + var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

71 if (ExecutionEnvironment.canUseDOM && window.top === window.self) {

72

73 // First check if devtools is not installed

src/renderers/dom/__tests__/ReactDOMProduction-test.js

+5 -5

@@ -29,8 +29,8 @@ describe('ReactDOMProduction', () => {

29 };

30

31 jest.resetModules();

32 - React = require('React');

33 - ReactDOM = require('ReactDOM');

32 + React = require('react');

33 + ReactDOM = require('react-dom');

34 });

35

36 afterEach(() => {

@@ -39,7 +39,7 @@ describe('ReactDOMProduction', () => {

39 });

40

41 it('should use prod fbjs', () => {

42 - var warning = require('warning');

42 + var warning = require('fbjs/lib/warning');

43

44 spyOn(console, 'error');

45 warning(false, 'Do cows go moo?');

@@ -208,8 +208,8 @@ describe('ReactDOMProduction', () => {

208 supportsFiber: true,

209 };

210 jest.resetModules();

211 - React = require('React');

212 - ReactDOM = require('ReactDOM');

211 + React = require('react');

212 + ReactDOM = require('react-dom');

213 class Component extends React.Component {

214 render() {

215 return <div />;

src/renderers/dom/fiber/ReactDOMFiber.js

+3 -3

@@ -28,12 +28,12 @@ var ReactFiberReconciler = require('ReactFiberReconciler');

28 var ReactInputSelection = require('ReactInputSelection');

29 var ReactInstanceMap = require('ReactInstanceMap');

30 var ReactPortal = require('ReactPortal');

31 -var { isValidElement } = require('React');

31 +var { isValidElement } = require('react');

32 var { injectInternals } = require('ReactFiberDevToolsHook');

33

34 var findDOMNode = require('findDOMNode');

35 -var invariant = require('invariant');

36 -var warning = require('warning');

35 +var invariant = require('fbjs/lib/invariant');

36 +var warning = require('fbjs/lib/warning');

37

38 var {

39 createElement,

src/renderers/dom/fiber/ReactDOMFiberComponent.js

+3 -3

@@ -26,13 +26,13 @@ var ReactDOMFiberSelect = require('ReactDOMFiberSelect');

26 var ReactDOMFiberTextarea = require('ReactDOMFiberTextarea');

27 var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');

28

29 -var emptyFunction = require('emptyFunction');

30 -var invariant = require('invariant');

29 +var emptyFunction = require('fbjs/lib/emptyFunction');

30 +var invariant = require('fbjs/lib/invariant');

31 var isEventSupported = require('isEventSupported');

32 var setInnerHTML = require('setInnerHTML');

33 var setTextContent = require('setTextContent');

34 var inputValueTracking = require('inputValueTracking');

35 -var warning = require('warning');

35 +var warning = require('fbjs/lib/warning');

36

37 if (__DEV__) {

38 var ReactDOMInvalidARIAHook = require('ReactDOMInvalidARIAHook');

src/renderers/dom/fiber/ReactDOMFrameScheduling.js

+1 -1

@@ -22,7 +22,7 @@

22

23 import type { Deadline } from 'ReactFiberReconciler';

24

25 -var invariant = require('invariant');

25 +var invariant = require('fbjs/lib/invariant');

26

27 // TODO: There's no way to cancel these, because Fiber doesn't atm.

28 let rAF : (callback : (time : number) => void) => number;

src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

17 var ReactTestUtils = require('ReactTestUtils');

18

src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js

+2 -2

@@ -25,8 +25,8 @@ var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');

25 var ReactDOMComponentTree = require('ReactDOMComponentTree');

26 var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');

27

28 -var invariant = require('invariant');

29 -var warning = require('warning');

28 +var invariant = require('fbjs/lib/invariant');

29 +var warning = require('fbjs/lib/warning');

30

31 var didWarnValueDefaultValue = false;

32 var didWarnCheckedDefaultChecked = false;

src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js

+2 -2

@@ -12,9 +12,9 @@

12

13 'use strict';

14

15 -var React = require('React');

15 +var React = require('react');

16

17 -var warning = require('warning');

17 +var warning = require('fbjs/lib/warning');

18

19 function flattenChildren(children) {

20 var content = '';

src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js

+1 -1

@@ -21,7 +21,7 @@ type SelectWithWrapperState = HTMLSelectElement & {

21

22 var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');

23 var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');

24 -var warning = require('warning');

24 +var warning = require('fbjs/lib/warning');

25

26 var didWarnValueDefaultValue = false;

27

src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js

+2 -2

@@ -21,8 +21,8 @@ type TextAreaWithWrapperState = HTMLTextAreaElement & {

21 var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');

22 var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');

23

24 -var invariant = require('invariant');

25 -var warning = require('warning');

24 +var invariant = require('fbjs/lib/invariant');

25 +var warning = require('fbjs/lib/warning');

26

27 var didWarnValDefaultVal = false;

28

src/renderers/dom/shared/CSSPropertyOperations.js

+5 -5

@@ -12,14 +12,14 @@

12 'use strict';

13

14 var CSSProperty = require('CSSProperty');

15 -var ExecutionEnvironment = require('ExecutionEnvironment');

15 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

16

17 -var camelizeStyleName = require('camelizeStyleName');

17 +var camelizeStyleName = require('fbjs/lib/camelizeStyleName');

18 var dangerousStyleValue = require('dangerousStyleValue');

19 var getComponentName = require('getComponentName');

20 -var hyphenateStyleName = require('hyphenateStyleName');

21 -var memoizeStringOnly = require('memoizeStringOnly');

22 -var warning = require('warning');

20 +var hyphenateStyleName = require('fbjs/lib/hyphenateStyleName');

21 +var memoizeStringOnly = require('fbjs/lib/memoizeStringOnly');

22 +var warning = require('fbjs/lib/warning');

23

24 if (__DEV__) {

25 var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');

src/renderers/dom/shared/DOMProperty.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var invariant = require('invariant');

14 +var invariant = require('fbjs/lib/invariant');

15

16 function checkMask(value, bitmask) {

17 return (value & bitmask) === bitmask;

src/renderers/dom/shared/DOMPropertyOperations.js

+1 -1

@@ -16,7 +16,7 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');

16 var ReactInstrumentation = require('ReactInstrumentation');

17

18 var quoteAttributeValueForBrowser = require('quoteAttributeValueForBrowser');

19 -var warning = require('warning');

19 +var warning = require('fbjs/lib/warning');

20

21 var VALID_ATTRIBUTE_NAME_REGEX = new RegExp(

22 '^[' + DOMProperty.ATTRIBUTE_NAME_START_CHAR + '][' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$'

src/renderers/dom/shared/ReactDOMComponentTree.js

+1 -1

@@ -15,7 +15,7 @@ var DOMProperty = require('DOMProperty');

15 var ReactDOMComponentFlags = require('ReactDOMComponentFlags');

16 var { HostComponent, HostText } = require('ReactTypeOfWork');

17

18 -var invariant = require('invariant');

18 +var invariant = require('fbjs/lib/invariant');

19

20 var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;

21 var Flags = ReactDOMComponentFlags;

src/renderers/dom/shared/ReactDOMSelection.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var ExecutionEnvironment = require('ExecutionEnvironment');

14 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

15

16 var getNodeForCharacterOffset = require('getNodeForCharacterOffset');

17 var getTextContentAccessor = require('getTextContentAccessor');

src/renderers/dom/shared/ReactEventListener.js

+3 -3

@@ -11,15 +11,15 @@

11

12 'use strict';

13

14 -var EventListener = require('EventListener');

15 -var ExecutionEnvironment = require('ExecutionEnvironment');

14 +var EventListener = require('fbjs/lib/EventListener');

15 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

16 var PooledClass = require('PooledClass');

17 var ReactDOMComponentTree = require('ReactDOMComponentTree');

18 var ReactGenericBatching = require('ReactGenericBatching');

19 var ReactTypeOfWork = require('ReactTypeOfWork');

20

21 var getEventTarget = require('getEventTarget');

22 -var getUnboundedScrollPosition = require('getUnboundedScrollPosition');

22 +var getUnboundedScrollPosition = require('fbjs/lib/getUnboundedScrollPosition');

23

24 var { HostRoot } = ReactTypeOfWork;

25

src/renderers/dom/shared/ReactInputSelection.js

+3 -3

@@ -13,9 +13,9 @@

13

14 var ReactDOMSelection = require('ReactDOMSelection');

15

16 -var containsNode = require('containsNode');

17 -var focusNode = require('focusNode');

18 -var getActiveElement = require('getActiveElement');

16 +var containsNode = require('fbjs/lib/containsNode');

17 +var focusNode = require('fbjs/lib/focusNode');

18 +var getActiveElement = require('fbjs/lib/getActiveElement');

19

20 function isInDocument(node) {

21 return containsNode(document.documentElement, node);

src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js

+3 -3

@@ -11,9 +11,9 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

16 -var ReactDOMServer = require('ReactDOMServer');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16 +var ReactDOMServer = require('react-dom/server');

17

18 describe('CSSPropertyOperations', () => {

19 var CSSPropertyOperations;

src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js

+3 -3

@@ -59,11 +59,11 @@ describe('ReactBrowserEventEmitter', () => {

59 beforeEach(() => {

60 jest.resetModules();

61 LISTENER.mockClear();

62 - EventListener = require('EventListener');

62 + EventListener = require('fbjs/lib/EventListener');

63 EventPluginHub = require('EventPluginHub');

64 EventPluginRegistry = require('EventPluginRegistry');

65 - React = require('React');

66 - ReactDOM = require('ReactDOM');

65 + React = require('react');

66 + ReactDOM = require('react-dom');

67 ReactDOMComponentTree = require('ReactDOMComponentTree');

68 ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');

69 ReactTestUtils = require('ReactTestUtils');

src/renderers/dom/shared/__tests__/ReactDOM-test.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16 var ReactTestUtils = require('ReactTestUtils');

17

18 describe('ReactDOM', () => {

src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js

+4 -4

@@ -26,10 +26,10 @@ describe('ReactDOMComponent', () => {

26

27 beforeEach(() => {

28 jest.resetModules();

29 - React = require('React');

30 - ReactDOM = require('ReactDOM');

29 + React = require('react');

30 + ReactDOM = require('react-dom');

31 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

32 - ReactDOMServer = require('ReactDOMServer');

32 + ReactDOMServer = require('react-dom/server');

33 ReactTestUtils = require('ReactTestUtils');

34 inputValueTracking = require('inputValueTracking');

35 });

@@ -1102,7 +1102,7 @@ describe('ReactDOMComponent', () => {

1102 expect(ReactDOMServer.renderToString(<div is="custom-div" />)).toContain('is="custom-div"');

1103 }

1104 });

1105 -

1105 +

1106 it('should work load and error events on <image> element in SVG', () => {

1107 spyOn(console, 'log');

1108 var container = document.createElement('div');

src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js

+3 -3

@@ -39,10 +39,10 @@ describe('ReactDOMComponentTree', () => {

39 }

40

41 beforeEach(() => {

42 - React = require('React');

43 - ReactDOM = require('ReactDOM');

42 + React = require('react');

43 + ReactDOM = require('react-dom');

44 ReactDOMComponentTree = require('ReactDOMComponentTree');

45 - ReactDOMServer = require('ReactDOMServer');

45 + ReactDOMServer = require('react-dom/server');

46 });

47

48 it('finds nodes for instances', () => {

src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js

+1 -1

@@ -18,7 +18,7 @@ describe('ReactDOMInvalidARIAHook', () => {

18

19 beforeEach(() => {

20 jest.resetModules();

21 - React = require('React');

21 + React = require('react');

22 ReactTestUtils = require('ReactTestUtils');

23

24 mountComponent = function(props) {

src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js

+3 -3

@@ -19,10 +19,10 @@ var ReactDOMServer;

19 describe('ReactDOMSVG', () => {

20

21 beforeEach(() => {

22 - React = require('React');

23 - ReactDOM = require('ReactDOM');

22 + React = require('react');

23 + ReactDOM = require('react-dom');

24 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

25 - ReactDOMServer = require('ReactDOMServer');

25 + ReactDOMServer = require('react-dom/server');

26 });

27

28 it('creates initial namespaced markup', () => {

src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js

+3 -3

@@ -26,9 +26,9 @@ function filterOutComments(nodeList) {

26

27 describe('ReactDOMTextComponent', () => {

28 beforeEach(() => {

29 - React = require('React');

30 - ReactDOM = require('ReactDOM');

31 - ReactDOMServer = require('ReactDOMServer');

29 + React = require('react');

30 + ReactDOM = require('react-dom');

31 + ReactDOMServer = require('react-dom/server');

32 });

33

34 it('updates a mounted text component in place', () => {

src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js

+2 -2

@@ -19,8 +19,8 @@ describe('ReactEventIndependence', () => {

19 beforeEach(() => {

20 jest.resetModules();

21

22 - React = require('React');

23 - ReactDOM = require('ReactDOM');

22 + React = require('react');

23 + ReactDOM = require('react-dom');

24 ReactTestUtils = require('ReactTestUtils');

25 });

26

src/renderers/dom/shared/__tests__/ReactEventListener-test.js

+2 -2

@@ -24,8 +24,8 @@ describe('ReactEventListener', () => {

24

25 beforeEach(() => {

26 jest.resetModules();

27 - React = require('React');

28 - ReactDOM = require('ReactDOM');

27 + React = require('react');

28 + ReactDOM = require('react-dom');

29 ReactDOMComponentTree = require('ReactDOMComponentTree');

30 ReactEventListener = require('ReactEventListener');

31 ReactTestUtils = require('ReactTestUtils');

src/renderers/dom/shared/__tests__/ReactMount-test.js

+4 -4

@@ -22,9 +22,9 @@ describe('ReactMount', () => {

22 beforeEach(() => {

23 jest.resetModules();

24

25 - React = require('React');

26 - ReactDOM = require('ReactDOM');

27 - ReactDOMServer = require('ReactDOMServer');

25 + React = require('react');

26 + ReactDOM = require('react-dom');

27 + ReactDOMServer = require('react-dom/server');

28 ReactMount = require('ReactMount');

29 ReactTestUtils = require('ReactTestUtils');

30

@@ -231,7 +231,7 @@ describe('ReactMount', () => {

231

232 it('should warn if the unmounted node was rendered by another copy of React', () => {

233 jest.resetModules();

234 - var ReactDOMOther = require('ReactDOM');

234 + var ReactDOMOther = require('react-dom');

235 var container = document.createElement('div');

236

237 class Component extends React.Component {

src/renderers/dom/shared/__tests__/ReactMountDestruction-test.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16

17 describe('ReactMount', () => {

18 it('should destroy a react root upon request', () => {

src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js

+3 -3

@@ -30,9 +30,9 @@ describe('rendering React components at document', () => {

30 beforeEach(() => {

31 jest.resetModules();

32

33 - React = require('React');

34 - ReactDOM = require('ReactDOM');

35 - ReactDOMServer = require('ReactDOMServer');

33 + React = require('react');

34 + ReactDOM = require('react-dom');

35 + ReactDOMServer = require('react-dom/server');

36 getTestDocument = require('getTestDocument');

37

38 testDocument = getTestDocument();

src/renderers/dom/shared/__tests__/ReactServerRendering-test.js

+4 -4

@@ -26,16 +26,16 @@ var ROOT_ATTRIBUTE_NAME;

26 describe('ReactDOMServer', () => {

27 beforeEach(() => {

28 jest.resetModules();

29 - React = require('React');

30 - ReactDOM = require('ReactDOM');

29 + React = require('react');

30 + ReactDOM = require('react-dom');

31 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

32 ReactMarkupChecksum = require('ReactMarkupChecksum');

33 ReactTestUtils = require('ReactTestUtils');

34 ReactReconcileTransaction = require('ReactReconcileTransaction');

35

36 - ExecutionEnvironment = require('ExecutionEnvironment');

36 + ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

37 ExecutionEnvironment.canUseDOM = false;

38 - ReactDOMServer = require('ReactDOMServer');

38 + ReactDOMServer = require('react-dom/server');

39

40 var DOMProperty = require('DOMProperty');

41 ID_ATTRIBUTE_NAME = DOMProperty.ID_ATTRIBUTE_NAME;

src/renderers/dom/shared/__tests__/findDOMNode-test.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16 var ReactTestUtils = require('ReactTestUtils');

17

18 describe('findDOMNode', () => {

src/renderers/dom/shared/__tests__/inputValueTracking-test.js

+1 -1

@@ -10,7 +10,7 @@

10 */

11 'use strict';

12

13 -var React = require('React');

13 +var React = require('react');

14 var ReactTestUtils = require('ReactTestUtils');

15 var inputValueTracking = require('inputValueTracking');

16

src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js

+1 -1

@@ -12,7 +12,7 @@

12 'use strict';

13

14 var EventPropagators = require('EventPropagators');

15 -var ExecutionEnvironment = require('ExecutionEnvironment');

15 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

16 var FallbackCompositionState = require('FallbackCompositionState');

17 var SyntheticCompositionEvent = require('SyntheticCompositionEvent');

18 var SyntheticInputEvent = require('SyntheticInputEvent');

src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js

+1 -1

@@ -13,7 +13,7 @@

13

14 var EventPluginHub = require('EventPluginHub');

15 var EventPropagators = require('EventPropagators');

16 -var ExecutionEnvironment = require('ExecutionEnvironment');

16 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

17 var ReactControlledComponent = require('ReactControlledComponent');

18 var ReactDOMComponentTree = require('ReactDOMComponentTree');

19 var ReactGenericBatching = require('ReactGenericBatching');

src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js

+3 -3

@@ -12,15 +12,15 @@

12 'use strict';

13

14 var EventPropagators = require('EventPropagators');

15 -var ExecutionEnvironment = require('ExecutionEnvironment');

15 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

16 var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');

17 var ReactDOMComponentTree = require('ReactDOMComponentTree');

18 var ReactInputSelection = require('ReactInputSelection');

19 var SyntheticEvent = require('SyntheticEvent');

20

21 -var getActiveElement = require('getActiveElement');

21 +var getActiveElement = require('fbjs/lib/getActiveElement');

22 var isTextInputElement = require('isTextInputElement');

23 -var shallowEqual = require('shallowEqual');

23 +var shallowEqual = require('fbjs/lib/shallowEqual');

24

25 var skipSelectionChangeEvent = (

26 ExecutionEnvironment.canUseDOM &&

src/renderers/dom/shared/eventPlugins/SimpleEventPlugin.js

+1 -1

@@ -26,7 +26,7 @@ var SyntheticUIEvent = require('SyntheticUIEvent');

26 var SyntheticWheelEvent = require('SyntheticWheelEvent');

27

28 var getEventCharCode = require('getEventCharCode');

29 -var invariant = require('invariant');

29 +var invariant = require('fbjs/lib/invariant');

30

31 import type {TopLevelTypes} from 'EventConstants';

32 import type {

src/renderers/dom/shared/eventPlugins/TapEventPlugin.js

+1 -1

@@ -15,7 +15,7 @@

15 var EventPluginUtils = require('EventPluginUtils');

16 var EventPropagators = require('EventPropagators');

17 var SyntheticUIEvent = require('SyntheticUIEvent');

18 -var TouchEventUtils = require('TouchEventUtils');

18 +var TouchEventUtils = require('fbjs/lib/TouchEventUtils');

19 var ViewportMetrics = require('ViewportMetrics');

20

21 var isStartish = EventPluginUtils.isStartish;

src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js

+2 -2

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactTestUtils = require('ReactTestUtils');

16

17 var EventMapping = {

@@ -47,7 +47,7 @@ describe('BeforeInputEventPlugin', function() {

47

48 // Modules which have dependency on BeforeInputEventPlugin are stored

49 // in ModuleCache so that we can use these modules ouside test functions.

50 - this.ReactDOM = require('ReactDOM');

50 + this.ReactDOM = require('react-dom');

51 this.ReactDOMComponentTree = require('ReactDOMComponentTree');

52 this.SyntheticCompositionEvent = require('SyntheticCompositionEvent');

53 this.SyntheticInputEvent = require('SyntheticInputEvent');

src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16 var ReactTestUtils = require('ReactTestUtils');

17 var ChangeEventPlugin = require('ChangeEventPlugin');

18 var inputValueTracking = require('inputValueTracking');

src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js

+2 -2

@@ -21,8 +21,8 @@ describe('EnterLeaveEventPlugin', () => {

21 jest.resetModules();

22

23 EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');

24 - React = require('React');

25 - ReactDOM = require('ReactDOM');

24 + React = require('react');

25 + ReactDOM = require('react-dom');

26 ReactDOMComponentTree = require('ReactDOMComponentTree');

27 });

28

src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js

+2 -2

@@ -28,8 +28,8 @@ describe('SelectEventPlugin', () => {

28 }

29

30 beforeEach(() => {

31 - React = require('React');

32 - ReactDOM = require('ReactDOM');

31 + React = require('react');

32 + ReactDOM = require('react-dom');

33 ReactDOMComponentTree = require('ReactDOMComponentTree');

34 ReactTestUtils = require('ReactTestUtils');

35 SelectEventPlugin = require('SelectEventPlugin');

src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js

+2 -2

@@ -35,8 +35,8 @@ describe('SimpleEventPlugin', function() {

35 }

36

37 beforeEach(function() {

38 - React = require('React');

39 - ReactDOM = require('ReactDOM');

38 + React = require('react');

39 + ReactDOM = require('react-dom');

40 ReactTestUtils = require('ReactTestUtils');

41

42 onClick = jest.fn();

src/renderers/dom/shared/findDOMNode.js

+3 -3

@@ -10,12 +10,12 @@

10 * @flow

11 */

12

13 -var ReactCurrentOwner = require('ReactCurrentOwner');

13 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

14 var ReactInstanceMap = require('ReactInstanceMap');

15

16 var getComponentName = require('getComponentName');

17 -var invariant = require('invariant');

18 -var warning = require('warning');

17 +var invariant = require('fbjs/lib/invariant');

18 +var warning = require('fbjs/lib/warning');

19

20 let findFiber = function(arg) {

21 invariant(false, 'Missing injection for fiber findDOMNode');

src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js

+2 -2

@@ -12,10 +12,10 @@

12 'use strict';

13

14 var DOMProperty = require('DOMProperty');

15 -var ReactComponentTreeHook = require('ReactComponentTreeHook');

15 +var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

16 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');

17

18 -var warning = require('warning');

18 +var warning = require('fbjs/lib/warning');

19

20 var warnedProperties = {};

21 var rARIA = new RegExp('^(aria)-[' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$');

src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js

+2 -2

@@ -11,10 +11,10 @@

11

12 'use strict';

13

14 -var ReactComponentTreeHook = require('ReactComponentTreeHook');

14 +var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

15 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');

16

17 -var warning = require('warning');

17 +var warning = require('fbjs/lib/warning');

18

19 var didWarnValueNull = false;

20

src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js

+2 -2

@@ -13,10 +13,10 @@

13

14 var DOMProperty = require('DOMProperty');

15 var EventPluginRegistry = require('EventPluginRegistry');

16 -var ReactComponentTreeHook = require('ReactComponentTreeHook');

16 +var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

17 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');

18

19 -var warning = require('warning');

19 +var warning = require('fbjs/lib/warning');

20

21 function getStackAddendum(debugID) {

22 if (debugID != null) {

src/renderers/dom/shared/setInnerHTML.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var ExecutionEnvironment = require('ExecutionEnvironment');

14 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

15 var DOMNamespaces = require('DOMNamespaces');

16

17 var WHITESPACE_TEST = /^[ \r\n\t\f]/;

src/renderers/dom/shared/setTextContent.js

+2 -2

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var ExecutionEnvironment = require('ExecutionEnvironment');

14 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

15 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');

16 var setInnerHTML = require('setInnerHTML');

17

@@ -28,7 +28,7 @@ var setInnerHTML = require('setInnerHTML');

28 var setTextContent = function(node, text) {

29 if (text) {

30 var firstChild = node.firstChild;

31 -

31 +

32 if (firstChild && firstChild === node.lastChild && firstChild.nodeType === 3) {

33 firstChild.nodeValue = text;

34 return;

src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js

+2 -2

@@ -21,8 +21,8 @@ describe('SyntheticEvent', () => {

21

22 beforeEach(() => {

23 SyntheticEvent = require('SyntheticEvent');

24 - React = require('React');

25 - ReactDOM = require('ReactDOM');

24 + React = require('react');

25 + ReactDOM = require('react-dom');

26 ReactTestUtils = require('ReactTestUtils');

27

28 createEvent = function(nativeEvent) {

src/renderers/dom/shared/utils/AutoFocusUtils.js

+1 -1

@@ -13,7 +13,7 @@

13

14 var ReactDOMComponentTree = require('ReactDOMComponentTree');

15

16 -var focusNode = require('focusNode');

16 +var focusNode = require('fbjs/lib/focusNode');

17

18 var AutoFocusUtils = {

19 focusDOMComponent: function() {

src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js

+2 -2

@@ -11,10 +11,10 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactPropTypesSecret = require('ReactPropTypesSecret');

16

17 -var warning = require('warning');

17 +var warning = require('fbjs/lib/warning');

18

19 var hasReadOnlyValue = {

20 'button': true,

src/renderers/dom/shared/utils/getTextContentAccessor.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var ExecutionEnvironment = require('ExecutionEnvironment');

14 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

15

16 var contentKey = null;

17

src/renderers/dom/shared/utils/getVendorPrefixedEventName.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var ExecutionEnvironment = require('ExecutionEnvironment');

14 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

15

16 /**

17 * Generate a mapping of standard vendor prefixes using the defined style property and event name.

src/renderers/dom/shared/utils/isEventSupported.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var ExecutionEnvironment = require('ExecutionEnvironment');

14 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

15

16 var useHasFeature;

17 if (ExecutionEnvironment.canUseDOM) {

src/renderers/dom/shared/validateDOMNesting.js

+2 -2

@@ -11,9 +11,9 @@

11

12 'use strict';

13

14 -var emptyFunction = require('emptyFunction');

14 +var emptyFunction = require('fbjs/lib/emptyFunction');

15 var getComponentName = require('getComponentName');

16 -var warning = require('warning');

16 +var warning = require('fbjs/lib/warning');

17

18 var validateDOMNesting = emptyFunction;

19

src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js

+2 -2

@@ -17,8 +17,8 @@ describe('ReactDOMIframe', () => {

17 var ReactTestUtils;

18

19 beforeEach(() => {

20 - React = require('React');

21 - ReactDOM = require('ReactDOM');

20 + React = require('react');

21 + ReactDOM = require('react-dom');

22 ReactTestUtils = require('ReactTestUtils');

23 });

24

src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js

+4 -4

@@ -12,7 +12,7 @@

12 'use strict';

13

14

15 -var emptyFunction = require('emptyFunction');

15 +var emptyFunction = require('fbjs/lib/emptyFunction');

16

17 describe('ReactDOMInput', () => {

18 var React;

@@ -31,9 +31,9 @@ describe('ReactDOMInput', () => {

31

32 beforeEach(() => {

33 jest.resetModules();

34 - React = require('React');

35 - ReactDOM = require('ReactDOM');

36 - ReactDOMServer = require('ReactDOMServer');

34 + React = require('react');

35 + ReactDOM = require('react-dom');

36 + ReactDOMServer = require('react-dom/server');

37 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

38 ReactTestUtils = require('ReactTestUtils');

39 inputValueTracking = require('inputValueTracking');

src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js

+2 -2

@@ -23,8 +23,8 @@ describe('ReactDOMOption', () => {

23 var ReactTestUtils;

24

25 beforeEach(() => {

26 - React = require('React');

27 - ReactDOM = require('ReactDOM');

26 + React = require('react');

27 + ReactDOM = require('react-dom');

28 ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

29 ReactTestUtils = require('ReactTestUtils');

30 });

src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js

+3 -3

@@ -21,9 +21,9 @@ describe('ReactDOMSelect', () => {

21 var noop = function() {};

22

23 beforeEach(() => {

24 - React = require('React');

25 - ReactDOM = require('ReactDOM');

26 - ReactDOMServer = require('ReactDOMServer');

24 + React = require('react');

25 + ReactDOM = require('react-dom');

26 + ReactDOMServer = require('react-dom/server');

27 ReactTestUtils = require('ReactTestUtils');

28 });

29

src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js

+4 -4

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var emptyFunction = require('emptyFunction');

14 +var emptyFunction = require('fbjs/lib/emptyFunction');

15

16 describe('ReactDOMTextarea', () => {

17 var React;

@@ -22,9 +22,9 @@ describe('ReactDOMTextarea', () => {

22 var renderTextarea;

23

24 beforeEach(() => {

25 - React = require('React');

26 - ReactDOM = require('ReactDOM');

27 - ReactDOMServer = require('ReactDOMServer');

25 + React = require('react');

26 + ReactDOM = require('react-dom');

27 + ReactDOMServer = require('react-dom/server');

28 ReactTestUtils = require('ReactTestUtils');

29

30 renderTextarea = function(component, container) {

src/renderers/dom/stack/client/Danger.js

+4 -4

@@ -12,11 +12,11 @@

12 'use strict';

13

14 var DOMLazyTree = require('DOMLazyTree');

15 -var ExecutionEnvironment = require('ExecutionEnvironment');

15 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

16

17 -var createNodesFromMarkup = require('createNodesFromMarkup');

18 -var emptyFunction = require('emptyFunction');

19 -var invariant = require('invariant');

17 +var createNodesFromMarkup = require('fbjs/lib/createNodesFromMarkup');

18 +var emptyFunction = require('fbjs/lib/emptyFunction');

19 +var invariant = require('fbjs/lib/invariant');

20

21 var Danger = {

22

src/renderers/dom/stack/client/ReactDOMComponent.js

+3 -3

@@ -31,13 +31,13 @@ var ReactInstrumentation = require('ReactInstrumentation');

31 var ReactMultiChild = require('ReactMultiChild');

32 var ReactServerRenderingTransaction = require('ReactServerRenderingTransaction');

33

34 -var emptyFunction = require('emptyFunction');

34 +var emptyFunction = require('fbjs/lib/emptyFunction');

35 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');

36 -var invariant = require('invariant');

36 +var invariant = require('fbjs/lib/invariant');

37 var isEventSupported = require('isEventSupported');

38 var inputValueTracking = require('inputValueTracking');

39 var validateDOMNesting = require('validateDOMNesting');

40 -var warning = require('warning');

40 +var warning = require('fbjs/lib/warning');

41 var didWarnShadyDOM = false;

42

43 var Flags = ReactDOMComponentFlags;

src/renderers/dom/stack/client/ReactDOMTextComponent.js

+1 -1

@@ -16,7 +16,7 @@ var DOMLazyTree = require('DOMLazyTree');

16 var ReactDOMComponentTree = require('ReactDOMComponentTree');

17

18 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');

19 -var invariant = require('invariant');

19 +var invariant = require('fbjs/lib/invariant');

20 var validateDOMNesting = require('validateDOMNesting');

21

22 /**

src/renderers/dom/stack/client/ReactMount.js

+4 -4

@@ -13,9 +13,9 @@

13

14 var DOMLazyTree = require('DOMLazyTree');

15 var DOMProperty = require('DOMProperty');

16 -var React = require('React');

16 +var React = require('react');

17 var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');

18 -var ReactCurrentOwner = require('ReactCurrentOwner');

18 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

19 var ReactDOMComponentTree = require('ReactDOMComponentTree');

20 var ReactDOMContainerInfo = require('ReactDOMContainerInfo');

21 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

@@ -29,10 +29,10 @@ var ReactUpdates = require('ReactUpdates');

29

30 var getContextForSubtree = require('getContextForSubtree');

31 var instantiateReactComponent = require('instantiateReactComponent');

32 -var invariant = require('invariant');

32 +var invariant = require('fbjs/lib/invariant');

33 var setInnerHTML = require('setInnerHTML');

34 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');

35 -var warning = require('warning');

35 +var warning = require('fbjs/lib/warning');

36 var validateCallback = require('validateCallback');

37

38 var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;

src/renderers/dom/stack/client/wrappers/ReactDOMInput.js

+2 -2

@@ -15,8 +15,8 @@ var DOMPropertyOperations = require('DOMPropertyOperations');

15 var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');

16 var ReactDOMComponentTree = require('ReactDOMComponentTree');

17

18 -var invariant = require('invariant');

19 -var warning = require('warning');

18 +var invariant = require('fbjs/lib/invariant');

19 +var warning = require('fbjs/lib/warning');

20

21 var didWarnValueDefaultValue = false;

22 var didWarnCheckedDefaultChecked = false;

src/renderers/dom/stack/client/wrappers/ReactDOMOption.js

+2 -2

@@ -11,11 +11,11 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactDOMComponentTree = require('ReactDOMComponentTree');

16 var ReactDOMSelect = require('ReactDOMSelect');

17

18 -var warning = require('warning');

18 +var warning = require('fbjs/lib/warning');

19 var didWarnInvalidOptionChildren = false;

20

21 function flattenChildren(children) {

src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js

+1 -1

@@ -14,7 +14,7 @@

14 var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');

15 var ReactDOMComponentTree = require('ReactDOMComponentTree');

16

17 -var warning = require('warning');

17 +var warning = require('fbjs/lib/warning');

18

19 var didWarnValueDefaultValue = false;

20

src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js

+2 -2

@@ -14,8 +14,8 @@

14 var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');

15 var ReactDOMComponentTree = require('ReactDOMComponentTree');

16

17 -var invariant = require('invariant');

18 -var warning = require('warning');

17 +var invariant = require('fbjs/lib/invariant');

18 +var warning = require('fbjs/lib/warning');

19

20 var didWarnValDefaultVal = false;

21

src/renderers/dom/stack/server/ReactServerRendering.js

+3 -3

@@ -10,7 +10,7 @@

10 */

11 'use strict';

12

13 -var React = require('React');

13 +var React = require('react');

14 var ReactDOMContainerInfo = require('ReactDOMContainerInfo');

15 var ReactInstrumentation = require('ReactInstrumentation');

16 var ReactMarkupChecksum = require('ReactMarkupChecksum');

@@ -20,9 +20,9 @@ var ReactServerRenderingTransaction =

20 require('ReactServerRenderingTransaction');

21 var ReactUpdates = require('ReactUpdates');

22

23 -var emptyObject = require('emptyObject');

23 +var emptyObject = require('fbjs/lib/emptyObject');

24 var instantiateReactComponent = require('instantiateReactComponent');

25 -var invariant = require('invariant');

25 +var invariant = require('fbjs/lib/invariant');

26

27 var pendingTransactions = 0;

28

src/renderers/dom/stack/server/ReactServerUpdateQueue.js

+1 -1

@@ -14,7 +14,7 @@

14

15 var ReactUpdateQueue = require('ReactUpdateQueue');

16

17 -var warning = require('warning');

17 +var warning = require('fbjs/lib/warning');

18

19 import type { Transaction } from 'Transaction';

20

src/renderers/native/NativeMethodsMixin.js

+1 -1

@@ -16,7 +16,7 @@ var ReactNativeAttributePayload = require('ReactNativeAttributePayload');

16 var TextInputState = require('TextInputState');

17 var UIManager = require('UIManager');

18

19 -var invariant = require('invariant');

19 +var invariant = require('fbjs/lib/invariant');

20

21 type MeasureOnSuccessCallback = (

22 x: number,

src/renderers/native/ReactNativeBridgeEventPlugin.js

+1 -1

@@ -15,7 +15,7 @@ var EventPropagators = require('EventPropagators');

15 var SyntheticEvent = require('SyntheticEvent');

16 var UIManager = require('UIManager');

17

18 -var warning = require('warning');

18 +var warning = require('fbjs/lib/warning');

19

20 var customBubblingEventTypes = UIManager.customBubblingEventTypes;

21 var customDirectEventTypes = UIManager.customDirectEventTypes;

src/renderers/native/ReactNativeComponentTree.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var invariant = require('invariant');

14 +var invariant = require('fbjs/lib/invariant');

15

16 var instanceCache = {};

17 var instanceProps = {};

src/renderers/native/ReactNativeEventEmitter.js

+1 -1

@@ -18,7 +18,7 @@ var ReactNativeComponentTree = require('ReactNativeComponentTree');

18 var ReactNativeTagHandles = require('ReactNativeTagHandles');

19 var ReactGenericBatching = require('ReactGenericBatching');

20

21 -var warning = require('warning');

21 +var warning = require('fbjs/lib/warning');

22

23 /**

24 * Version of `ReactBrowserEventEmitter` that works on the receiving side of a

src/renderers/native/ReactNativeFiber.js

+2 -2

@@ -29,9 +29,9 @@ const ReactPortal = require('ReactPortal');

29 const UIManager = require('UIManager');

30

31 const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');

32 -const emptyObject = require('emptyObject');

32 +const emptyObject = require('fbjs/lib/emptyObject');

33 const findNodeHandle = require('findNodeHandle');

34 -const invariant = require('invariant');

34 +const invariant = require('fbjs/lib/invariant');

35

36 const { injectInternals } = require('ReactFiberDevToolsHook');

37 const {

src/renderers/native/ReactNativeMount.js

+2 -2

@@ -11,7 +11,7 @@

11 */

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactInstrumentation = require('ReactInstrumentation');

16 var ReactNativeContainerInfo = require('ReactNativeContainerInfo');

17 var ReactNativeTagHandles = require('ReactNativeTagHandles');

@@ -20,7 +20,7 @@ var ReactUpdateQueue = require('ReactUpdateQueue');

20 var ReactUpdates = require('ReactUpdates');

21 var UIManager = require('UIManager');

22

23 -var emptyObject = require('emptyObject');

23 +var emptyObject = require('fbjs/lib/emptyObject');

24 var instantiateReactComponent = require('instantiateReactComponent');

25 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');

26

src/renderers/native/ReactNativeStackInjection.js

+2 -2

@@ -19,7 +19,7 @@

19 */

20 require('InitializeCore');

21

22 -var React = require('React');

22 +var React = require('react');

23 var ReactComponentEnvironment = require('ReactComponentEnvironment');

24 var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');

25 var ReactEmptyComponent = require('ReactEmptyComponent');

@@ -31,7 +31,7 @@ var ReactSimpleEmptyComponent = require('ReactSimpleEmptyComponent');

31 var ReactUpdates = require('ReactUpdates');

32

33 var findNodeHandle = require('findNodeHandle');

34 -var invariant = require('invariant');

34 +var invariant = require('fbjs/lib/invariant');

35

36 function inject() {

37 ReactGenericBatching.injection.injectStackBatchedUpdates(

src/renderers/native/ReactNativeTagHandles.js

+1 -1

@@ -11,7 +11,7 @@

11 */

12 'use strict';

13

14 -var invariant = require('invariant');

14 +var invariant = require('fbjs/lib/invariant');

15

16 /**

17 * Keeps track of allocating and associating native "tags" which are numeric,

src/renderers/native/ReactNativeTextComponent.js

+1 -1

@@ -15,7 +15,7 @@ var ReactNativeComponentTree = require('ReactNativeComponentTree');

15 var ReactNativeTagHandles = require('ReactNativeTagHandles');

16 var UIManager = require('UIManager');

17

18 -var invariant = require('invariant');

18 +var invariant = require('fbjs/lib/invariant');

19

20 var ReactNativeTextComponent = function(text) {

21 // This is really a ReactText (ReactNode), not a ReactElement

src/renderers/native/ReactNativeViewConfigRegistry.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -const invariant = require('invariant');

15 +const invariant = require('fbjs/lib/invariant');

16

17 export type ReactNativeBaseComponentViewConfig = {

18 validAttributes: Object,

src/renderers/native/__tests__/ReactNativeEvents-test.js

+1 -1

@@ -22,7 +22,7 @@ beforeEach(() => {

22 jest.resetModules();

23

24 RCTEventEmitter = require('RCTEventEmitter');

25 - React = require('React');

25 + React = require('react');

26 ReactNative = require('ReactNative');

27 ResponderEventPlugin = require('ResponderEventPlugin');

28 UIManager = require('UIManager');

src/renderers/native/__tests__/ReactNativeMount-test.js

+1 -1

@@ -20,7 +20,7 @@ describe('ReactNative', () => {

20 beforeEach(() => {

21 jest.resetModules();

22

23 - React = require('React');

23 + React = require('react');

24 ReactNative = require('ReactNative');

25 UIManager = require('UIManager');

26 createReactNativeComponentClass = require('createReactNativeComponentClass');

src/renderers/native/findNodeHandle.js

+3 -3

@@ -12,11 +12,11 @@

12

13 'use strict';

14

15 -var ReactCurrentOwner = require('ReactCurrentOwner');

15 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

16 var ReactInstanceMap = require('ReactInstanceMap');

17

18 -var invariant = require('invariant');

19 -var warning = require('warning');

18 +var invariant = require('fbjs/lib/invariant');

19 +var warning = require('fbjs/lib/warning');

20

21 import type { ReactInstance } from 'ReactInstanceType';

22

src/renderers/noop/ReactNoop.js

+1 -1

@@ -27,7 +27,7 @@ var ReactInstanceMap = require('ReactInstanceMap');

27 var {

28 AnimationPriority,

29 } = require('ReactPriorityLevel');

30 -var emptyObject = require('emptyObject');

30 +var emptyObject = require('fbjs/lib/emptyObject');

31

32 const UPDATE_SIGNAL = {};

33

src/renderers/shared/ReactDebugTool.js

+4 -4

@@ -14,11 +14,11 @@

14

15 var ReactInvalidSetStateWarningHook = require('ReactInvalidSetStateWarningHook');

16 var ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook');

17 -var ReactComponentTreeHook = require('ReactComponentTreeHook');

18 -var ExecutionEnvironment = require('ExecutionEnvironment');

17 +var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

18 +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');

19

20 -var performanceNow = require('performanceNow');

21 -var warning = require('warning');

20 +var performanceNow = require('fbjs/lib/performanceNow');

21 +var warning = require('fbjs/lib/warning');

22

23 import type { ReactElement } from 'ReactElementType';

24 import type { DebugID } from 'ReactInstanceType';

src/renderers/shared/ReactPerf.js

+1 -1

@@ -13,7 +13,7 @@

13 'use strict';

14

15 var ReactDebugTool = require('ReactDebugTool');

16 -var warning = require('warning');

16 +var warning = require('fbjs/lib/warning');

17 var alreadyWarned = false;

18

19 import type { FlushHistory } from 'ReactDebugTool';

src/renderers/shared/fiber/ReactChildFiber.js

+4 -4

@@ -32,16 +32,16 @@ var ReactFiber = require('ReactFiber');

32 var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect');

33 var ReactTypeOfWork = require('ReactTypeOfWork');

34

35 -var emptyObject = require('emptyObject');

35 +var emptyObject = require('fbjs/lib/emptyObject');

36 var getIteratorFn = require('getIteratorFn');

37 -var invariant = require('invariant');

37 +var invariant = require('fbjs/lib/invariant');

38 var ReactFeatureFlags = require('ReactFeatureFlags');

39 -var ReactCurrentOwner = require('ReactCurrentOwner');

39 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

40

41 if (__DEV__) {

42 var { getCurrentFiberStackAddendum } = require('ReactDebugCurrentFiber');

43 var { getComponentName } = require('ReactFiberTreeReflection');

44 - var warning = require('warning');

44 + var warning = require('fbjs/lib/warning');

45 var didWarnAboutMaps = false;

46 }

47

src/renderers/shared/fiber/ReactDebugCurrentFiber.js

+1 -1

@@ -18,7 +18,7 @@ type LifeCyclePhase = 'render' | 'getChildContext';

18

19 if (__DEV__) {

20 var getComponentName = require('getComponentName');

21 - var { getStackAddendumByWorkInProgressFiber } = require('ReactComponentTreeHook');

21 + var { getStackAddendumByWorkInProgressFiber } = require('react/lib/ReactComponentTreeHook');

22 }

23

24 function getCurrentFiberOwnerName() : string | null {

src/renderers/shared/fiber/ReactFiber.js

+1 -1

@@ -47,7 +47,7 @@ var {

47 cloneUpdateQueue,

48 } = require('ReactFiberUpdateQueue');

49

50 -var invariant = require('invariant');

50 +var invariant = require('fbjs/lib/invariant');

51

52 if (__DEV__) {

53 var getComponentName = require('getComponentName');

src/renderers/shared/fiber/ReactFiberBeginWork.js

+3 -3

@@ -60,13 +60,13 @@ var {

60 Err,

61 Ref,

62 } = require('ReactTypeOfSideEffect');

63 -var ReactCurrentOwner = require('ReactCurrentOwner');

63 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

64 var ReactFiberClassComponent = require('ReactFiberClassComponent');

65 -var invariant = require('invariant');

65 +var invariant = require('fbjs/lib/invariant');

66

67 if (__DEV__) {

68 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');

69 - var warning = require('warning');

69 + var warning = require('fbjs/lib/warning');

70 var warnedAboutStatelessRefs = {};

71 }

72

src/renderers/shared/fiber/ReactFiberClassComponent.js

+4 -4

@@ -33,14 +33,14 @@ var {

33 var { hasContextChanged } = require('ReactFiberContext');

34 var { getComponentName, isMounted } = require('ReactFiberTreeReflection');

35 var ReactInstanceMap = require('ReactInstanceMap');

36 -var emptyObject = require('emptyObject');

37 -var shallowEqual = require('shallowEqual');

38 -var invariant = require('invariant');

36 +var emptyObject = require('fbjs/lib/emptyObject');

37 +var shallowEqual = require('fbjs/lib/shallowEqual');

38 +var invariant = require('fbjs/lib/invariant');

39

40 const isArray = Array.isArray;

41

42 if (__DEV__) {

43 - var warning = require('warning');

43 + var warning = require('fbjs/lib/warning');

44 var warnOnInvalidCallback = function(callback : mixed, callerName : string) {

45 warning(

46 callback === null || typeof callback === 'function',

src/renderers/shared/fiber/ReactFiberCommitWork.js

+1 -1

@@ -35,7 +35,7 @@ var {

35 ContentReset,

36 } = require('ReactTypeOfSideEffect');

37

38 -var invariant = require('invariant');

38 +var invariant = require('fbjs/lib/invariant');

39

40 module.exports = function<T, P, I, TI, PI, C, CX, PL>(

41 config : HostConfig<T, P, I, TI, PI, C, CX, PL>,

src/renderers/shared/fiber/ReactFiberCompleteWork.js

+1 -1

@@ -46,7 +46,7 @@ if (__DEV__) {

46 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');

47 }

48

49 -var invariant = require('invariant');

49 +var invariant = require('fbjs/lib/invariant');

50

51 module.exports = function<T, P, I, TI, PI, C, CX, PL>(

52 config : HostConfig<T, P, I, TI, PI, C, CX, PL>,

src/renderers/shared/fiber/ReactFiberContext.js

+4 -4

@@ -15,9 +15,9 @@

15 import type { Fiber } from 'ReactFiber';

16 import type { StackCursor } from 'ReactFiberStack';

17

18 -var emptyObject = require('emptyObject');

19 -var invariant = require('invariant');

20 -var warning = require('warning');

18 +var emptyObject = require('fbjs/lib/emptyObject');

19 +var invariant = require('fbjs/lib/invariant');

20 +var warning = require('fbjs/lib/warning');

21 var {

22 getComponentName,

23 isFiberMounted,

@@ -34,7 +34,7 @@ const {

34

35 if (__DEV__) {

36 var checkReactTypeSpec = require('checkReactTypeSpec');

37 - var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');

37 + var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');

38 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');

39 var warnedAboutMissingGetChildContext = {};

40 }

src/renderers/shared/fiber/ReactFiberDevToolsHook.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -var warning = require('warning');

15 +var warning = require('fbjs/lib/warning');

16

17 import type { Fiber } from 'ReactFiber';

18 import type { FiberRoot } from 'ReactFiberRoot';

src/renderers/shared/fiber/ReactFiberHostContext.js

+2 -2

@@ -16,7 +16,7 @@ import type { Fiber } from 'ReactFiber';

16 import type { HostConfig } from 'ReactFiberReconciler';

17 import type { StackCursor } from 'ReactFiberStack';

18

19 -const emptyObject = require('emptyObject');

19 +const emptyObject = require('fbjs/lib/emptyObject');

20

21 const {

22 createCursor,

@@ -24,7 +24,7 @@ const {

24 push,

25 } = require('ReactFiberStack');

26

27 -const invariant = require('invariant');

27 +const invariant = require('fbjs/lib/invariant');

28

29 export type HostContext<C, CX> = {

30 getHostContext() : CX,

src/renderers/shared/fiber/ReactFiberReconciler.js

+1 -1

@@ -30,7 +30,7 @@ var { createFiberRoot } = require('ReactFiberRoot');

30 var ReactFiberScheduler = require('ReactFiberScheduler');

31

32 if (__DEV__) {

33 - var warning = require('warning');

33 + var warning = require('fbjs/lib/warning');

34 var ReactFiberInstrumentation = require('ReactFiberInstrumentation');

35 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');

36 var { getComponentName } = require('ReactFiberTreeReflection');

src/renderers/shared/fiber/ReactFiberScheduler.js

+4 -4

@@ -37,7 +37,7 @@ var {

37 const { reset } = require('ReactFiberStack');

38 var {

39 getStackAddendumByWorkInProgressFiber,

40 -} = require('ReactComponentTreeHook');

40 +} = require('react/lib/ReactComponentTreeHook');

41 var { logCapturedError } = require('ReactFiberErrorLogger');

42 var { invokeGuardedCallback } = require('ReactErrorUtils');

43

@@ -45,7 +45,7 @@ var ReactFiberBeginWork = require('ReactFiberBeginWork');

45 var ReactFiberCompleteWork = require('ReactFiberCompleteWork');

46 var ReactFiberCommitWork = require('ReactFiberCommitWork');

47 var ReactFiberHostContext = require('ReactFiberHostContext');

48 -var ReactCurrentOwner = require('ReactCurrentOwner');

48 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

49 var ReactFeatureFlags = require('ReactFeatureFlags');

50 var getComponentName = require('getComponentName');

51

@@ -89,10 +89,10 @@ var {

89 resetContext,

90 } = require('ReactFiberContext');

91

92 -var invariant = require('invariant');

92 +var invariant = require('fbjs/lib/invariant');

93

94 if (__DEV__) {

95 - var warning = require('warning');

95 + var warning = require('fbjs/lib/warning');

96 var ReactFiberInstrumentation = require('ReactFiberInstrumentation');

97 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');

98

src/renderers/shared/fiber/ReactFiberStack.js

+1 -1

@@ -18,7 +18,7 @@ export type StackCursor<T> = {

18 current: T

19 };

20

21 -const warning = require('warning');

21 +const warning = require('fbjs/lib/warning');

22

23 const valueStack : Array<any> = [];

24

src/renderers/shared/fiber/ReactFiberTreeReflection.js

+3 -3

@@ -15,12 +15,12 @@

15 import type { Fiber } from 'ReactFiber';

16

17 var ReactInstanceMap = require('ReactInstanceMap');

18 -var ReactCurrentOwner = require('ReactCurrentOwner');

18 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

19

20 -var invariant = require('invariant');

20 +var invariant = require('fbjs/lib/invariant');

21

22 if (__DEV__) {

23 - var warning = require('warning');

23 + var warning = require('fbjs/lib/warning');

24 }

25

26 var {

src/renderers/shared/fiber/ReactFiberUpdateQueue.js

+2 -2

@@ -25,9 +25,9 @@ const {

25 TaskPriority,

26 } = require('ReactPriorityLevel');

27

28 -const invariant = require('invariant');

28 +const invariant = require('fbjs/lib/invariant');

29 if (__DEV__) {

30 - var warning = require('warning');

30 + var warning = require('fbjs/lib/warning');

31 }

32

33 type PartialState<State, Props> =

src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js

+1 -1

@@ -19,7 +19,7 @@ var ReactFeatureFlags;

19 describe('ReactCoroutine', () => {

20 beforeEach(() => {

21 jest.resetModules();

22 - React = require('React');

22 + React = require('react');

23 ReactNoop = require('ReactNoop');

24 ReactCoroutine = require('ReactCoroutine');

25 ReactFeatureFlags = require('ReactFeatureFlags');

src/renderers/shared/fiber/__tests__/ReactIncremental-test.js

+1 -1

@@ -18,7 +18,7 @@ var ReactFeatureFlags;

18 describe('ReactIncremental', () => {

19 beforeEach(() => {

20 jest.resetModules();

21 - React = require('React');

21 + React = require('react');

22 ReactNoop = require('ReactNoop');

23

24 ReactFeatureFlags = require('ReactFeatureFlags');

src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js

+2 -2

@@ -18,7 +18,7 @@ var ReactFeatureFlags;

18 describe('ReactIncrementalErrorHandling', () => {

19 beforeEach(() => {

20 jest.resetModules();

21 - React = require('React');

21 + React = require('react');

22 ReactNoop = require('ReactNoop');

23 ReactFeatureFlags = require('ReactFeatureFlags');

24 ReactFeatureFlags.disableNewFiberFeatures = false;

@@ -948,7 +948,7 @@ describe('ReactIncrementalErrorHandling', () => {

948 } else {

949 jest.unmock('ReactFiberErrorLogger');

950 }

951 - React = require('React');

951 + React = require('react');

952 ReactNoop = require('ReactNoop');

953 }

954

src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js

+1 -1

@@ -18,7 +18,7 @@ var ReactFeatureFlags;

18 describe('ReactIncrementalReflection', () => {

19 beforeEach(() => {

20 jest.resetModules();

21 - React = require('React');

21 + React = require('react');

22 ReactNoop = require('ReactNoop');

23 ReactFeatureFlags = require('ReactFeatureFlags');

24 ReactFeatureFlags.disableNewFiberFeatures = false;

src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js

+1 -1

@@ -18,7 +18,7 @@ var ReactFeatureFlags;

18 describe('ReactIncrementalScheduling', () => {

19 beforeEach(() => {

20 jest.resetModules();

21 - React = require('React');

21 + React = require('react');

22 ReactNoop = require('ReactNoop');

23 ReactFeatureFlags = require('ReactFeatureFlags');

24 ReactFeatureFlags.disableNewFiberFeatures = false;

src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js

+1 -1

@@ -18,7 +18,7 @@ var ReactFeatureFlags;

18 describe('ReactIncrementalSideEffects', () => {

19 beforeEach(() => {

20 jest.resetModules();

21 - React = require('React');

21 + React = require('react');

22 ReactNoop = require('ReactNoop');

23 ReactFeatureFlags = require('ReactFeatureFlags');

24 ReactFeatureFlags.disableNewFiberFeatures = false;

src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js

+1 -1

@@ -18,7 +18,7 @@ var ReactFeatureFlags;

18 describe('ReactIncrementalUpdates', () => {

19 beforeEach(() => {

20 jest.resetModuleRegistry();

21 - React = require('React');

21 + React = require('react');

22 ReactNoop = require('ReactNoop');

23 ReactFeatureFlags = require('ReactFeatureFlags');

24 ReactFeatureFlags.disableNewFiberFeatures = false;

src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js

+1 -1

@@ -20,7 +20,7 @@ var ReactFeatureFlags;

20 describe('ReactTopLevelFragment', function() {

21 beforeEach(function() {

22 jest.resetModules();

23 - React = require('React');

23 + React = require('react');

24 ReactNoop = require('ReactNoop');

25 ReactFeatureFlags = require('ReactFeatureFlags');

26 ReactFeatureFlags.disableNewFiberFeatures = false;

src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js

+1 -1

@@ -20,7 +20,7 @@ var ReactFeatureFlags;

20 describe('ReactTopLevelText', () => {

21 beforeEach(() => {

22 jest.resetModules();

23 - React = require('React');

23 + React = require('react');

24 ReactNoop = require('ReactNoop');

25 ReactFeatureFlags = require('ReactFeatureFlags');

26 ReactFeatureFlags.disableNewFiberFeatures = false;

src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -var warning = require('warning');

15 +var warning = require('fbjs/lib/warning');

16

17 var ReactInvalidSetStateWarningHook = {};

18

src/renderers/shared/shared/event/EventPluginHub.js

+1 -1

@@ -17,7 +17,7 @@ var ReactErrorUtils = require('ReactErrorUtils');

17

18 var accumulateInto = require('accumulateInto');

19 var forEachAccumulated = require('forEachAccumulated');

20 -var invariant = require('invariant');

20 +var invariant = require('fbjs/lib/invariant');

21

22 /**

23 * Internal queue of events that have accumulated their dispatches and are

src/renderers/shared/shared/event/EventPluginRegistry.js

+1 -1

@@ -27,7 +27,7 @@ type NamesToPlugins = {[key: PluginName]: PluginModule<AnyNativeEvent>};

27

28 type EventPluginOrder = null | Array<PluginName>;

29

30 -var invariant = require('invariant');

30 +var invariant = require('fbjs/lib/invariant');

31

32 /**

33 * Injectable ordering of event plugins.

src/renderers/shared/shared/event/EventPluginUtils.js

+2 -2

@@ -13,8 +13,8 @@

13

14 var ReactErrorUtils = require('ReactErrorUtils');

15

16 -var invariant = require('invariant');

17 -var warning = require('warning');

16 +var invariant = require('fbjs/lib/invariant');

17 +var warning = require('fbjs/lib/warning');

18

19 /**

20 * Injected dependencies:

src/renderers/shared/shared/event/EventPropagators.js

+1 -1

@@ -16,7 +16,7 @@ var ReactTreeTraversal = require('ReactTreeTraversal');

16

17 var accumulateInto = require('accumulateInto');

18 var forEachAccumulated = require('forEachAccumulated');

19 -var warning = require('warning');

19 +var warning = require('fbjs/lib/warning');

20

21 import type { PropagationPhases } from 'EventConstants';

22

src/renderers/shared/shared/event/ReactControlledComponent.js

+1 -1

@@ -13,7 +13,7 @@

13

14 var EventPluginUtils = require('EventPluginUtils');

15

16 -var invariant = require('invariant');

16 +var invariant = require('fbjs/lib/invariant');

17

18 // Use to restore controlled state after a change event has fired.

19

src/renderers/shared/shared/event/SyntheticEvent.js

+2 -2

@@ -13,8 +13,8 @@

13

14 var PooledClass = require('PooledClass');

15

16 -var emptyFunction = require('emptyFunction');

17 -var warning = require('warning');

16 +var emptyFunction = require('fbjs/lib/emptyFunction');

17 +var warning = require('fbjs/lib/warning');

18

19 var didWarnForAddedNewProperty = false;

20 var isProxySupported = typeof Proxy === 'function';

src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js

+2 -2

@@ -14,8 +14,8 @@

14

15 const EventPluginUtils = require('EventPluginUtils');

16

17 -const invariant = require('invariant');

18 -const warning = require('warning');

17 +const invariant = require('fbjs/lib/invariant');

18 +const warning = require('fbjs/lib/warning');

19

20 const {

21 isEndish,

src/renderers/shared/shared/getContextForSubtree.js

+2 -2

@@ -12,8 +12,8 @@

12

13 const ReactInstanceMap = require('ReactInstanceMap');

14

15 -const emptyObject = require('emptyObject');

16 -const invariant = require('invariant');

15 +const emptyObject = require('fbjs/lib/emptyObject');

16 +const invariant = require('fbjs/lib/invariant');

17

18 let getContextFiber = function(arg) {

19 invariant(false, 'Missing injection for fiber getContextForSubtree');

src/renderers/shared/stack/reconciler/CallbackQueue.js

+1 -1

@@ -14,7 +14,7 @@

14

15 var PooledClass = require('PooledClass');

16

17 -var invariant = require('invariant');

17 +var invariant = require('fbjs/lib/invariant');

18 var validateCallback = require('validateCallback');

19

20 /**

src/renderers/shared/stack/reconciler/ReactChildReconciler.js

+3 -3

@@ -18,7 +18,7 @@ var ReactReconciler = require('ReactReconciler');

18 var instantiateReactComponent = require('instantiateReactComponent');

19 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');

20 var traverseAllChildren = require('traverseAllChildren');

21 -var warning = require('warning');

21 +var warning = require('fbjs/lib/warning');

22

23 var ReactComponentTreeHook;

24

@@ -32,7 +32,7 @@ if (

32 // https://github.com/facebook/react/issues/7240

33 // Remove the inline requires when we don't need them anymore:

34 // https://github.com/facebook/react/pull/7178

35 - ReactComponentTreeHook = require('ReactComponentTreeHook');

35 + ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

36 }

37

38 function instantiateChild(childInstances, child, name, selfDebugID) {

@@ -40,7 +40,7 @@ function instantiateChild(childInstances, child, name, selfDebugID) {

40 var keyUnique = (childInstances[name] === undefined);

41 if (__DEV__) {

42 if (!ReactComponentTreeHook) {

43 - ReactComponentTreeHook = require('ReactComponentTreeHook');

43 + ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

44 }

45 if (!keyUnique) {

46 warning(

src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -var invariant = require('invariant');

15 +var invariant = require('fbjs/lib/invariant');

16

17 type ReplaceNodeWithMarkup = (node: HTMLElement, markup: string) => void;

18 type ProcessChildrenUpdates = (instance: mixed, updates: mixed) => void;

src/renderers/shared/stack/reconciler/ReactCompositeComponent.js

+7 -7

@@ -11,10 +11,10 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactComponentEnvironment = require('ReactComponentEnvironment');

16 var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes');

17 -var ReactCurrentOwner = require('ReactCurrentOwner');

17 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

18 var ReactErrorUtils = require('ReactErrorUtils');

19 var ReactFeatureFlags = require('ReactFeatureFlags');

20 var ReactInstanceMap = require('ReactInstanceMap');

@@ -24,15 +24,15 @@ var ReactReconciler = require('ReactReconciler');

24

25 if (__DEV__) {

26 var checkReactTypeSpec = require('checkReactTypeSpec');

27 - var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');

27 + var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');

28 var warningAboutMissingGetChildContext = {};

29 }

30

31 -var emptyObject = require('emptyObject');

32 -var invariant = require('invariant');

33 -var shallowEqual = require('shallowEqual');

31 +var emptyObject = require('fbjs/lib/emptyObject');

32 +var invariant = require('fbjs/lib/invariant');

33 +var shallowEqual = require('fbjs/lib/shallowEqual');

34 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');

35 -var warning = require('warning');

35 +var warning = require('fbjs/lib/warning');

36

37 function StatelessComponent(Component) {

38 }

src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js

+1 -1

@@ -14,7 +14,7 @@

14 var ReactUpdates = require('ReactUpdates');

15 var Transaction = require('Transaction');

16

17 -var emptyFunction = require('emptyFunction');

17 +var emptyFunction = require('fbjs/lib/emptyFunction');

18

19 var RESET_BATCHED_UPDATES = {

20 initialize: emptyFunction,

src/renderers/shared/stack/reconciler/ReactHostComponent.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var invariant = require('invariant');

14 +var invariant = require('fbjs/lib/invariant');

15

16 var genericComponentClass = null;

17 var textComponentClass = null;

src/renderers/shared/stack/reconciler/ReactMultiChild.js

+3 -3

@@ -15,13 +15,13 @@ var ReactComponentEnvironment = require('ReactComponentEnvironment');

15 var ReactInstanceMap = require('ReactInstanceMap');

16 var ReactInstrumentation = require('ReactInstrumentation');

17

18 -var ReactCurrentOwner = require('ReactCurrentOwner');

18 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

19 var ReactReconciler = require('ReactReconciler');

20 var ReactChildReconciler = require('ReactChildReconciler');

21

22 -var emptyFunction = require('emptyFunction');

22 +var emptyFunction = require('fbjs/lib/emptyFunction');

23 var flattenChildren = require('flattenChildren');

24 -var invariant = require('invariant');

24 +var invariant = require('fbjs/lib/invariant');

25

26 /**

27 * Make an update for markup to be rendered and inserted at a supplied index.

src/renderers/shared/stack/reconciler/ReactNodeTypes.js

+2 -2

@@ -14,9 +14,9 @@

14

15 type ReactNodeType = 0 | 1 | 2;

16

17 -var React = require('React');

17 +var React = require('react');

18

19 -var invariant = require('invariant');

19 +var invariant = require('fbjs/lib/invariant');

20

21 var ReactNodeTypes = {

22 HOST: 0,

src/renderers/shared/stack/reconciler/ReactOwner.js

+2 -2

@@ -14,8 +14,8 @@

14

15 var { ClassComponent } = require('ReactTypeOfWork');

16

17 -var emptyObject = require('emptyObject');

18 -var invariant = require('invariant');

17 +var emptyObject = require('fbjs/lib/emptyObject');

18 +var invariant = require('fbjs/lib/invariant');

19

20 import type { Fiber } from 'ReactFiber';

21 import type { ReactInstance } from 'ReactInstanceType';

src/renderers/shared/stack/reconciler/ReactReconciler.js

+1 -1

@@ -14,7 +14,7 @@

14 var ReactRef = require('ReactRef');

15 var ReactInstrumentation = require('ReactInstrumentation');

16

17 -var warning = require('warning');

17 +var warning = require('fbjs/lib/warning');

18

19 /**

20 * Helper to call ReactRef.attachRefs with this composite component, split out

src/renderers/shared/stack/reconciler/ReactRef.js

+2 -2

@@ -21,8 +21,8 @@ var ReactRef = {};

21

22 if (__DEV__) {

23 var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes');

24 - var ReactComponentTreeHook = require('ReactComponentTreeHook');

25 - var warning = require('warning');

24 + var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

25 + var warning = require('fbjs/lib/warning');

26

27 var warnedAboutStatelessRefs = {};

28 }

src/renderers/shared/stack/reconciler/ReactUpdateQueue.js

+2 -2

@@ -11,13 +11,13 @@

11

12 'use strict';

13

14 -var ReactCurrentOwner = require('ReactCurrentOwner');

14 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

15 var ReactInstanceMap = require('ReactInstanceMap');

16 var ReactInstrumentation = require('ReactInstrumentation');

17 var ReactUpdates = require('ReactUpdates');

18

19 if (__DEV__) {

20 - var warning = require('warning');

20 + var warning = require('fbjs/lib/warning');

21 var warnOnInvalidCallback = function(callback : mixed, callerName : string) {

22 warning(

23 callback === null || typeof callback === 'function',

src/renderers/shared/stack/reconciler/ReactUpdates.js

+1 -1

@@ -16,7 +16,7 @@ var ReactFeatureFlags = require('ReactFeatureFlags');

16 var ReactReconciler = require('ReactReconciler');

17 var Transaction = require('Transaction');

18

19 -var invariant = require('invariant');

19 +var invariant = require('fbjs/lib/invariant');

20

21 var dirtyComponents = [];

22 var updateBatchNumber = 0;

src/renderers/shared/stack/reconciler/Transaction.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -var invariant = require('invariant');

15 +var invariant = require('fbjs/lib/invariant');

16

17 var OBSERVED_ERROR = {};

18

src/renderers/shared/stack/reconciler/instantiateReactComponent.js

+2 -2

@@ -16,8 +16,8 @@ var ReactEmptyComponent = require('ReactEmptyComponent');

16 var ReactHostComponent = require('ReactHostComponent');

17

18 var getNextDebugID = require('getNextDebugID');

19 -var invariant = require('invariant');

20 -var warning = require('warning');

19 +var invariant = require('fbjs/lib/invariant');

20 +var warning = require('fbjs/lib/warning');

21

22 // To avoid a cyclic dependency, we create the final class in this module

23 var ReactCompositeComponentWrapper = function(element) {

src/renderers/shared/utils/accumulate.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -var invariant = require('invariant');

15 +var invariant = require('fbjs/lib/invariant');

16

17 /**

18 * Accumulates items that must not be null or undefined.

src/renderers/shared/utils/accumulateInto.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -var invariant = require('invariant');

15 +var invariant = require('fbjs/lib/invariant');

16

17 /**

18 * Accumulates items that must not be null or undefined into the first one. This

src/renderers/shared/utils/validateCallback.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -const invariant = require('invariant');

15 +const invariant = require('fbjs/lib/invariant');

16

17 function validateCallback(callback: ?Function) {

18 invariant(

src/renderers/testing/ReactTestRendererFiber.js

+2 -2

@@ -15,9 +15,9 @@

15

16 var ReactFiberReconciler = require('ReactFiberReconciler');

17 var ReactGenericBatching = require('ReactGenericBatching');

18 -var emptyObject = require('emptyObject');

18 +var emptyObject = require('fbjs/lib/emptyObject');

19 var ReactTypeOfWork = require('ReactTypeOfWork');

20 -var invariant = require('invariant');

20 +var invariant = require('fbjs/lib/invariant');

21 var {

22 FunctionalComponent,

23 ClassComponent,

src/renderers/testing/__tests__/ReactTestRenderer-test.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactTestRenderer = require('ReactTestRenderer');

16 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');

17 var prettyFormat = require('pretty-format');

src/renderers/testing/stack/ReactTestMount.js

+3 -3

@@ -11,14 +11,14 @@

11 */

12 'use strict';

13

14 -var React = require('React');

14 +var React = require('react');

15 var ReactReconciler = require('ReactReconciler');

16 var ReactUpdates = require('ReactUpdates');

17

18 -var emptyObject = require('emptyObject');

18 +var emptyObject = require('fbjs/lib/emptyObject');

19 var getHostComponentFromComposite = require('getHostComponentFromComposite');

20 var instantiateReactComponent = require('instantiateReactComponent');

21 -var invariant = require('invariant');

21 +var invariant = require('fbjs/lib/invariant');

22

23 export type TestRendererOptions = {

24 createNodeMock: (element: ReactElement<any>) => any,

src/renderers/testing/stack/ReactTestRendererStack.js

+1 -1

@@ -23,7 +23,7 @@ var ReactTestReconcileTransaction = require('ReactTestReconcileTransaction');

23 var ReactUpdates = require('ReactUpdates');

24 var ReactTestTextComponent = require('ReactTestTextComponent');

25 var ReactTestEmptyComponent = require('ReactTestEmptyComponent');

26 -var invariant = require('invariant');

26 +var invariant = require('fbjs/lib/invariant');

27

28 import type { ReactElement } from 'ReactElementType';

29 import type { ReactInstance } from 'ReactInstanceType';

src/shared/types/checkReactTypeSpec.js

+2 -2

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var checkPropTypes = require('checkPropTypes');

15 -var { getStackAddendum } = require('ReactDebugCurrentFrame');

14 +var checkPropTypes = require('react/lib/checkPropTypes');

15 +var { getStackAddendum } = require('react/lib/ReactDebugCurrentFrame');

16

17 function checkReactTypeSpec(

18 typeSpecs,

src/shared/utils/PooledClass.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -var invariant = require('invariant');

15 +var invariant = require('fbjs/lib/invariant');

16

17 /**

18 * Static poolers. Several custom versions for each potential number of

src/shared/utils/deprecated.js

+1 -1

@@ -12,7 +12,7 @@

12

13 'use strict';

14

15 -var warning = require('warning');

15 +var warning = require('fbjs/lib/warning');

16

17 /**

18 * This will log a single deprecation notice per function and forward the call

src/shared/utils/flattenChildren.js

+3 -3

@@ -14,7 +14,7 @@

14

15 var KeyEscapeUtils = require('KeyEscapeUtils');

16 var traverseAllChildren = require('traverseAllChildren');

17 -var warning = require('warning');

17 +var warning = require('fbjs/lib/warning');

18

19 var ReactComponentTreeHook;

20

@@ -28,7 +28,7 @@ if (

28 // https://github.com/facebook/react/issues/7240

29 // Remove the inline requires when we don't need them anymore:

30 // https://github.com/facebook/react/pull/7178

31 - ReactComponentTreeHook = require('ReactComponentTreeHook');

31 + ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

32 }

33

34 /**

@@ -49,7 +49,7 @@ function flattenSingleChildIntoContext(

49 const keyUnique = (result[name] === undefined);

50 if (__DEV__) {

51 if (!ReactComponentTreeHook) {

52 - ReactComponentTreeHook = require('ReactComponentTreeHook');

52 + ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

53 }

54 if (!keyUnique) {

55 warning(

src/shared/utils/traverseAllChildren.js

+3 -3

@@ -11,13 +11,13 @@

11

12 'use strict';

13

14 -var ReactCurrentOwner = require('ReactCurrentOwner');

14 +var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');

15 var REACT_ELEMENT_TYPE = require('ReactElementSymbol');

16

17 var getIteratorFn = require('getIteratorFn');

18 -var invariant = require('invariant');

18 +var invariant = require('fbjs/lib/invariant');

19 var KeyEscapeUtils = require('KeyEscapeUtils');

20 -var warning = require('warning');

20 +var warning = require('fbjs/lib/warning');

21

22 var SEPARATOR = '.';

23 var SUBSEPARATOR = ':';

src/test/ReactComponentTreeTestUtils.js

+1 -1

@@ -11,7 +11,7 @@

11

12 'use strict';

13

14 -var ReactComponentTreeHook = require('ReactComponentTreeHook');

14 +var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');

15

16 function getRootDisplayNames() {

17 return ReactComponentTreeHook.getRootIDs()

src/test/ReactShallowRenderer.js

+3 -3

@@ -12,16 +12,16 @@

12

13 'use strict';

14

15 -var React = require('React');

15 +var React = require('react');

16 var ReactDOMInjection = require('ReactDOMInjection');

17 var ReactDOMStackInjection = require('ReactDOMStackInjection');

18 var ReactCompositeComponent = require('ReactCompositeComponent');

19 var ReactReconciler = require('ReactReconciler');

20 var ReactUpdates = require('ReactUpdates');

21

22 -var emptyObject = require('emptyObject');

22 +var emptyObject = require('fbjs/lib/emptyObject');

23 var getNextDebugID = require('getNextDebugID');

24 -var invariant = require('invariant');

24 +var invariant = require('fbjs/lib/invariant');

25

26 class NoopInternalComponent {

27 constructor(element) {

src/test/ReactTestUtils.js

+4 -4

@@ -15,20 +15,20 @@ var EventConstants = require('EventConstants');

15 var EventPluginHub = require('EventPluginHub');

16 var EventPluginRegistry = require('EventPluginRegistry');

17 var EventPropagators = require('EventPropagators');

18 -var React = require('React');

18 +var React = require('react');

19 var ReactControlledComponent = require('ReactControlledComponent');

20 -var ReactDOM = require('ReactDOM');

20 +var ReactDOM = require('react-dom');

21 var ReactDOMComponentTree = require('ReactDOMComponentTree');

22 var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');

23 var ReactFiberTreeReflection = require('ReactFiberTreeReflection');

24 -var ReactInstanceMap = require('ReactInstanceMap');

24 +var ReactInstanceMap = require('react-dom/lib/ReactInstanceMap');

25 var ReactTypeOfWork = require('ReactTypeOfWork');

26 var ReactGenericBatching = require('ReactGenericBatching');

27 var SyntheticEvent = require('SyntheticEvent');

28 var ReactShallowRenderer = require('ReactShallowRenderer');

29

30 var findDOMNode = require('findDOMNode');

31 -var invariant = require('invariant');

31 +var invariant = require('fbjs/lib/invariant');

32

33 var topLevelTypes = EventConstants.topLevelTypes;

34 var {

src/test/__tests__/ReactTestUtils-test.js

+3 -3

@@ -19,9 +19,9 @@ var ReactTestUtils;

19 describe('ReactTestUtils', () => {

20

21 beforeEach(() => {

22 - React = require('React');

23 - ReactDOM = require('ReactDOM');

24 - ReactDOMServer = require('ReactDOMServer');

22 + React = require('react');

23 + ReactDOM = require('react-dom');

24 + ReactDOMServer = require('react-dom/server');

25 ReactTestUtils = require('ReactTestUtils');

26 });

27

src/test/__tests__/reactComponentExpect-test.js

+1 -1

@@ -18,7 +18,7 @@ var reactComponentExpect;

18 describe('reactComponentExpect', () => {

19

20 beforeEach(() => {

21 - React = require('React');

21 + React = require('react');

22 ReactTestUtils = require('ReactTestUtils');

23 reactComponentExpect = require('reactComponentExpect');

24 });

src/test/reactComponentExpect.js

+3 -3

@@ -11,15 +11,15 @@

11

12 'use strict';

13

14 -var ReactInstanceMap = require('ReactInstanceMap');

15 -var ReactTestUtils = require('ReactTestUtils');

14 +var ReactInstanceMap = require('react-dom/lib/ReactInstanceMap');

15 +var ReactTestUtils = require('react-dom/lib/ReactTestUtils');

16 var ReactTypeOfWork = require('ReactTypeOfWork');

17

18 var {

19 HostText,

20 } = ReactTypeOfWork;

21

22 -var invariant = require('invariant');

22 +var invariant = require('fbjs/lib/invariant');

23

24 // Fiber doesn't actually have an instance for empty components

25 // but we'll pretend it does while we keep compatibility with Stack.

src/umd/ReactDOMUMDEntry.js

+4 -4

@@ -11,8 +11,8 @@

11

12 'use strict';

13

14 -var React = require('React');

15 -var ReactDOM = require('ReactDOM');

14 +var React = require('react');

15 +var ReactDOM = require('react-dom');

16

17 var ReactDOMUMDEntry = ReactDOM;

18

@@ -20,8 +20,8 @@ if (__DEV__) {

20 ReactDOMUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {

21 // ReactPerf and ReactTestUtils currently only work with the DOM renderer

22 // so we expose them from here, but only in DEV mode.

23 - ReactPerf: require('ReactPerf'),

24 - ReactTestUtils: require('ReactTestUtils'),

23 + ReactPerf: require('react-dom/lib/ReactPerf'),

24 + ReactTestUtils: require('react-dom/lib/ReactTestUtils'),

25 };

26 }

27

src/umd/ReactUMDEntry.js

+2 -2

@@ -16,7 +16,7 @@ var React = require('React');

16 // `version` will be added here by the React module.

17 var ReactUMDEntry = Object.assign({

18 __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {

19 - ReactCurrentOwner: require('ReactCurrentOwner'),

19 + ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),

20 },

21 }, React);

22

@@ -25,7 +25,7 @@ if (__DEV__) {

25 ReactUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

26 {

27 // ReactComponentTreeHook should not be included in production.

28 - ReactComponentTreeHook: require('ReactComponentTreeHook'),

28 + ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),

29 }

30 );

31 }

src/umd/ReactWithAddonsUMDEntry.js

+2 -2

@@ -17,7 +17,7 @@ var ReactWithAddons = require('ReactWithAddons');

17 var ReactWithAddonsUMDEntry = Object.assign({

18 __SECRET_INJECTED_REACT_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: null, // Will be injected by ReactDOM UMD build.

19 __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {

20 - ReactCurrentOwner: require('ReactCurrentOwner'),

20 + ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),

21 },

22 }, ReactWithAddons);

23

@@ -26,7 +26,7 @@ if (__DEV__) {

26 ReactWithAddonsUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

27 {

28 // ReactComponentTreeHook should not be included in production.

29 - ReactComponentTreeHook: require('ReactComponentTreeHook'),

29 + ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),

30 }

31 );

32 }