diff --git a/gulpfile.js b/gulpfile.js
index 6229fd7af6..8cacc65343 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -103,35 +103,52 @@ var paths = {
},
};
-var moduleMapBase = Object.assign(
- {'object-assign': 'object-assign'},
- require('fbjs/module-map')
-);
+var moduleMapBase = {'object-assign': 'object-assign'};
+
+var fbjsModules = require('fbjs/module-map');
+for (var key in fbjsModules) {
+ var path = fbjsModules[key];
+ moduleMapBase[path] = path;
+}
var moduleMapReact = Object.assign(
{
// Addons needs to reach into DOM internals
- ReactDOM: 'react-dom/lib/ReactDOM',
- ReactInstanceMap: 'react-dom/lib/ReactInstanceMap',
- ReactTestUtils: 'react-dom/lib/ReactTestUtils',
- ReactPerf: 'react-dom/lib/ReactPerf',
- getVendorPrefixedEventName: 'react-dom/lib/getVendorPrefixedEventName',
+ 'react-dom': 'react-dom',
+ 'react-dom/lib/ReactInstanceMap': 'react-dom/lib/ReactInstanceMap',
+ 'react-dom/lib/ReactTestUtils': 'react-dom/lib/ReactTestUtils',
+ 'react-dom/lib/ReactPerf': 'react-dom/lib/ReactPerf',
+ 'react-dom/lib/getVendorPrefixedEventName': 'react-dom/lib/getVendorPrefixedEventName',
+
+ // Alias
+ 'react': './React',
+ // Shared state
+ 'react/lib/ReactCurrentOwner': './ReactCurrentOwner',
+ 'react/lib/checkPropTypes': './checkPropTypes',
+ 'react/lib/ReactComponentTreeHook': './ReactComponentTreeHook',
+ 'react/lib/ReactDebugCurrentFrame': './ReactDebugCurrentFrame',
},
moduleMapBase
);
var rendererSharedState = {
// Alias
- React: 'react/lib/React',
+ 'react': 'react/lib/React',
// Shared state
- ReactCurrentOwner: 'react/lib/ReactCurrentOwner',
- checkPropTypes: 'react/lib/checkPropTypes',
- ReactComponentTreeHook: 'react/lib/ReactComponentTreeHook',
- ReactDebugCurrentFrame: 'react/lib/ReactDebugCurrentFrame',
+ 'react/lib/ReactCurrentOwner': 'react/lib/ReactCurrentOwner',
+ 'react/lib/checkPropTypes': 'react/lib/checkPropTypes',
+ 'react/lib/ReactComponentTreeHook': 'react/lib/ReactComponentTreeHook',
+ 'react/lib/ReactDebugCurrentFrame': 'react/lib/ReactDebugCurrentFrame',
};
var moduleMapReactDOM = Object.assign(
- {},
+ {
+ 'react-dom': './ReactDOM',
+ 'react-dom/lib/ReactInstanceMap': './ReactInstanceMap',
+ 'react-dom/lib/ReactTestUtils': './ReactTestUtils',
+ 'react-dom/lib/ReactPerf': './ReactPerf',
+ 'react-dom/lib/getVendorPrefixedEventName': './getVendorPrefixedEventName',
+ },
rendererSharedState,
moduleMapBase
);
diff --git a/src/addons/ReactAddonsDOMDependencies.js b/src/addons/ReactAddonsDOMDependencies.js
index 70856ec6c5..db86d1f495 100644
--- a/src/addons/ReactAddonsDOMDependencies.js
+++ b/src/addons/ReactAddonsDOMDependencies.js
@@ -11,7 +11,7 @@
'use strict';
-var ReactDOM = require('ReactDOM');
+var ReactDOM = require('react-dom');
exports.getReactDOM = function() {
return ReactDOM;
@@ -23,14 +23,14 @@ if (__DEV__) {
exports.getReactPerf = function() {
if (!ReactPerf) {
- ReactPerf = require('ReactPerf');
+ ReactPerf = require('react-dom/lib/ReactPerf');
}
return ReactPerf;
};
exports.getReactTestUtils = function() {
if (!ReactTestUtils) {
- ReactTestUtils = require('ReactTestUtils');
+ ReactTestUtils = require('react-dom/lib/ReactTestUtils');
}
return ReactTestUtils;
};
diff --git a/src/addons/ReactFragment.js b/src/addons/ReactFragment.js
index 5d83e84533..6211ad101b 100644
--- a/src/addons/ReactFragment.js
+++ b/src/addons/ReactFragment.js
@@ -14,9 +14,9 @@
var ReactChildren = require('ReactChildren');
var ReactElement = require('ReactElement');
-var emptyFunction = require('emptyFunction');
-var invariant = require('invariant');
-var warning = require('warning');
+var emptyFunction = require('fbjs/lib/emptyFunction');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
/**
* We used to allow keyed objects to serve as a collection of ReactElements,
diff --git a/src/addons/ReactWithAddons.js b/src/addons/ReactWithAddons.js
index ae6890a3f8..6a7a3b01a3 100644
--- a/src/addons/ReactWithAddons.js
+++ b/src/addons/ReactWithAddons.js
@@ -11,7 +11,7 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactAddonsDOMDependencies = require('ReactAddonsDOMDependencies');
var ReactComponentWithPureRenderMixin =
require('ReactComponentWithPureRenderMixin');
diff --git a/src/addons/__tests__/ReactComponentWithPureRenderMixin-test.js b/src/addons/__tests__/ReactComponentWithPureRenderMixin-test.js
index 2f5c7a36c0..b3f636d280 100644
--- a/src/addons/__tests__/ReactComponentWithPureRenderMixin-test.js
+++ b/src/addons/__tests__/ReactComponentWithPureRenderMixin-test.js
@@ -18,7 +18,7 @@ var ReactTestUtils;
describe('ReactComponentWithPureRenderMixin', () => {
beforeEach(() => {
- React = require('React');
+ React = require('react');
ReactComponentWithPureRenderMixin =
require('ReactComponentWithPureRenderMixin');
ReactTestUtils = require('ReactTestUtils');
diff --git a/src/addons/__tests__/ReactFragment-test.js b/src/addons/__tests__/ReactFragment-test.js
index fad7646540..b73c58eb75 100644
--- a/src/addons/__tests__/ReactFragment-test.js
+++ b/src/addons/__tests__/ReactFragment-test.js
@@ -18,8 +18,8 @@ var ReactFragment;
describe('ReactFragment', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactFragment = require('ReactFragment');
});
diff --git a/src/addons/__tests__/renderSubtreeIntoContainer-test.js b/src/addons/__tests__/renderSubtreeIntoContainer-test.js
index 95db6c2435..155aa3e4f2 100644
--- a/src/addons/__tests__/renderSubtreeIntoContainer-test.js
+++ b/src/addons/__tests__/renderSubtreeIntoContainer-test.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var ReactTestUtils = require('ReactTestUtils');
var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');
diff --git a/src/addons/shallowCompare.js b/src/addons/shallowCompare.js
index 334f7a2db6..f06b8a6e54 100644
--- a/src/addons/shallowCompare.js
+++ b/src/addons/shallowCompare.js
@@ -11,7 +11,7 @@
'use strict';
-var shallowEqual = require('shallowEqual');
+var shallowEqual = require('fbjs/lib/shallowEqual');
/**
* Does a shallow comparison for props and state.
diff --git a/src/addons/transitions/ReactCSSTransitionGroup.js b/src/addons/transitions/ReactCSSTransitionGroup.js
index 150d56ade4..8e6ae4c1b0 100644
--- a/src/addons/transitions/ReactCSSTransitionGroup.js
+++ b/src/addons/transitions/ReactCSSTransitionGroup.js
@@ -11,7 +11,7 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactTransitionGroup = require('ReactTransitionGroup');
var ReactCSSTransitionGroupChild = require('ReactCSSTransitionGroupChild');
diff --git a/src/addons/transitions/ReactCSSTransitionGroupChild.js b/src/addons/transitions/ReactCSSTransitionGroupChild.js
index 4ac8233f68..63d61ae0d7 100644
--- a/src/addons/transitions/ReactCSSTransitionGroupChild.js
+++ b/src/addons/transitions/ReactCSSTransitionGroupChild.js
@@ -11,10 +11,10 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactAddonsDOMDependencies = require('ReactAddonsDOMDependencies');
-var CSSCore = require('CSSCore');
+var CSSCore = require('fbjs/lib/CSSCore');
var ReactTransitionEvents = require('ReactTransitionEvents');
var onlyChild = require('onlyChild');
diff --git a/src/addons/transitions/ReactTransitionEvents.js b/src/addons/transitions/ReactTransitionEvents.js
index 64e8e44062..82d8b46480 100644
--- a/src/addons/transitions/ReactTransitionEvents.js
+++ b/src/addons/transitions/ReactTransitionEvents.js
@@ -11,9 +11,9 @@
'use strict';
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
-var getVendorPrefixedEventName = require('getVendorPrefixedEventName');
+var getVendorPrefixedEventName = require('react-dom/lib/getVendorPrefixedEventName');
var endEvents = [];
diff --git a/src/addons/transitions/ReactTransitionGroup.js b/src/addons/transitions/ReactTransitionGroup.js
index 62372801fa..d5209e6b31 100644
--- a/src/addons/transitions/ReactTransitionGroup.js
+++ b/src/addons/transitions/ReactTransitionGroup.js
@@ -11,10 +11,10 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactTransitionChildMapping = require('ReactTransitionChildMapping');
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
/**
* A basis for animations. When children are declaratively added or removed,
diff --git a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
index 858fb46fdf..b6dbb48e00 100644
--- a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
+++ b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
@@ -11,7 +11,7 @@
'use strict';
-var CSSCore = require('CSSCore');
+var CSSCore = require('fbjs/lib/CSSCore');
var React;
var ReactDOM;
@@ -24,8 +24,8 @@ describe('ReactCSSTransitionGroup', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactCSSTransitionGroup = require('ReactCSSTransitionGroup');
container = document.createElement('div');
diff --git a/src/addons/transitions/__tests__/ReactTransitionChildMapping-test.js b/src/addons/transitions/__tests__/ReactTransitionChildMapping-test.js
index 621549691f..5f61f0b817 100644
--- a/src/addons/transitions/__tests__/ReactTransitionChildMapping-test.js
+++ b/src/addons/transitions/__tests__/ReactTransitionChildMapping-test.js
@@ -16,7 +16,7 @@ var ReactTransitionChildMapping;
describe('ReactTransitionChildMapping', () => {
beforeEach(() => {
- React = require('React');
+ React = require('react');
ReactTransitionChildMapping = require('ReactTransitionChildMapping');
});
diff --git a/src/addons/transitions/__tests__/ReactTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
index 248a5e08b2..0f393f92dd 100644
--- a/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
+++ b/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
@@ -21,8 +21,8 @@ describe('ReactTransitionGroup', () => {
var container;
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTransitionGroup = require('ReactTransitionGroup');
container = document.createElement('div');
diff --git a/src/addons/update.js b/src/addons/update.js
index 6e3c41785a..47390e0652 100644
--- a/src/addons/update.js
+++ b/src/addons/update.js
@@ -13,7 +13,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var hasOwnProperty = {}.hasOwnProperty;
function shallowCopy(x) {
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index 1d2f1b6e8e..73d0e1575f 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -20,7 +20,7 @@ var ReactPropTypes = require('ReactPropTypes');
var ReactVersion = require('ReactVersion');
var onlyChild = require('onlyChild');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var checkPropTypes = require('checkPropTypes');
var createElement = ReactElement.createElement;
diff --git a/src/isomorphic/__tests__/React-test.js b/src/isomorphic/__tests__/React-test.js
index 2129b252fc..c36d58e02b 100644
--- a/src/isomorphic/__tests__/React-test.js
+++ b/src/isomorphic/__tests__/React-test.js
@@ -16,7 +16,7 @@ describe('React', () => {
var React;
beforeEach(() => {
- React = require('React');
+ React = require('react');
});
it('should log a deprecation warning once when using React.createMixin', () => {
diff --git a/src/isomorphic/children/ReactChildren.js b/src/isomorphic/children/ReactChildren.js
index bf53fea8b6..a870fec2e3 100644
--- a/src/isomorphic/children/ReactChildren.js
+++ b/src/isomorphic/children/ReactChildren.js
@@ -14,7 +14,7 @@
var PooledClass = require('PooledClass');
var ReactElement = require('ReactElement');
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
var traverseAllChildren = require('traverseAllChildren');
var twoArgumentPooler = PooledClass.twoArgumentPooler;
diff --git a/src/isomorphic/children/__tests__/ReactChildren-test.js b/src/isomorphic/children/__tests__/ReactChildren-test.js
index 6a2eaff703..ebe0d1c3c9 100644
--- a/src/isomorphic/children/__tests__/ReactChildren-test.js
+++ b/src/isomorphic/children/__tests__/ReactChildren-test.js
@@ -17,7 +17,7 @@ describe('ReactChildren', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactFragment = require('ReactFragment');
});
diff --git a/src/isomorphic/children/__tests__/onlyChild-test.js b/src/isomorphic/children/__tests__/onlyChild-test.js
index 9dad017e39..3481fbccac 100644
--- a/src/isomorphic/children/__tests__/onlyChild-test.js
+++ b/src/isomorphic/children/__tests__/onlyChild-test.js
@@ -19,7 +19,7 @@ describe('onlyChild', () => {
var WrapComponent;
beforeEach(() => {
- React = require('React');
+ React = require('react');
ReactFragment = require('ReactFragment');
onlyChild = require('onlyChild');
WrapComponent = class extends React.Component {
diff --git a/src/isomorphic/children/__tests__/sliceChildren-test.js b/src/isomorphic/children/__tests__/sliceChildren-test.js
index 5b41e1f24b..d09ab6757f 100644
--- a/src/isomorphic/children/__tests__/sliceChildren-test.js
+++ b/src/isomorphic/children/__tests__/sliceChildren-test.js
@@ -18,7 +18,7 @@ describe('sliceChildren', () => {
var sliceChildren;
beforeEach(() => {
- React = require('React');
+ React = require('react');
sliceChildren = require('sliceChildren');
});
diff --git a/src/isomorphic/children/onlyChild.js b/src/isomorphic/children/onlyChild.js
index 4d7d481819..c273cb592c 100644
--- a/src/isomorphic/children/onlyChild.js
+++ b/src/isomorphic/children/onlyChild.js
@@ -12,7 +12,7 @@
var ReactElement = require('ReactElement');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
/**
* Returns the first child in a collection of children and verifies that there
diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
index 4eab5185cb..d1ddfc665a 100644
--- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -29,8 +29,8 @@ describe('ReactContextValidator', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/isomorphic/classic/class/ReactClass.js b/src/isomorphic/classic/class/ReactClass.js
index a4efdd825a..ee85b4aefc 100644
--- a/src/isomorphic/classic/class/ReactClass.js
+++ b/src/isomorphic/classic/class/ReactClass.js
@@ -15,9 +15,9 @@ var ReactBaseClasses = require('ReactBaseClasses');
var ReactElement = require('ReactElement');
var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');
-var emptyObject = require('emptyObject');
-var invariant = require('invariant');
-var warning = require('warning');
+var emptyObject = require('fbjs/lib/emptyObject');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
var ReactComponent = ReactBaseClasses.Component;
diff --git a/src/isomorphic/classic/class/__tests__/ReactBind-test.js b/src/isomorphic/classic/class/__tests__/ReactBind-test.js
index 61e63a2670..bab8bba87d 100644
--- a/src/isomorphic/classic/class/__tests__/ReactBind-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactBind-test.js
@@ -11,7 +11,7 @@
/*global global:true*/
'use strict';
-var React = require('React');
+var React = require('react');
var ReactTestUtils = require('ReactTestUtils');
// TODO: Test render and all stock methods.
diff --git a/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js b/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
index 72852f08a3..69abd3904f 100644
--- a/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
@@ -11,7 +11,7 @@
/*global global:true*/
'use strict';
-var React = require('React');
+var React = require('react');
var ReactTestUtils = require('ReactTestUtils');
// TODO: Test render and all stock methods.
diff --git a/src/isomorphic/classic/class/__tests__/ReactClass-test.js b/src/isomorphic/classic/class/__tests__/ReactClass-test.js
index eabfd211ee..b727f7ba3b 100644
--- a/src/isomorphic/classic/class/__tests__/ReactClass-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactClass-test.js
@@ -18,8 +18,8 @@ var ReactTestUtils;
describe('ReactClass-spec', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js b/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
index 971f19199d..992bc55578 100644
--- a/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
@@ -23,7 +23,7 @@ var componentPropValidator;
describe('ReactClass-mixin', () => {
beforeEach(() => {
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
mixinPropValidator = jest.fn();
componentPropValidator = jest.fn();
diff --git a/src/isomorphic/classic/element/ReactElement.js b/src/isomorphic/classic/element/ReactElement.js
index eb322debea..7db7d5949a 100644
--- a/src/isomorphic/classic/element/ReactElement.js
+++ b/src/isomorphic/classic/element/ReactElement.js
@@ -13,7 +13,7 @@
var ReactCurrentOwner = require('ReactCurrentOwner');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var canDefineProperty = require('canDefineProperty');
var hasOwnProperty = Object.prototype.hasOwnProperty;
diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js
index 9df7e3fecd..b70fedc37e 100644
--- a/src/isomorphic/classic/element/ReactElementValidator.js
+++ b/src/isomorphic/classic/element/ReactElementValidator.js
@@ -29,7 +29,7 @@ var getComponentName = require('getComponentName');
var getIteratorFn = require('getIteratorFn');
if (__DEV__) {
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
}
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
index db3cf3fce1..a7967be465 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -28,8 +28,8 @@ describe('ReactElement', () => {
originalSymbol = global.Symbol;
global.Symbol = undefined;
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
// NOTE: We're explicitly not using JSX here. This is intended to test
@@ -502,7 +502,7 @@ describe('ReactElement', () => {
jest.resetModules();
- React = require('React');
+ React = require('react');
var Component = React.createClass({
render: function() {
@@ -534,8 +534,8 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
Child = jest.genMockFromModule('ReactElementTestChild');
});
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
index 49af3ea80e..38ef248683 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
@@ -19,8 +19,8 @@ describe('ReactElementClone', () => {
var ComponentClass;
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
// NOTE: We're explicitly not using JSX here. This is intended to test
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
index 6906eb16a9..34fe5b3a62 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
@@ -28,8 +28,8 @@ describe('ReactElementValidator', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
ComponentClass = React.createClass({
render: function() {
diff --git a/src/isomorphic/classic/types/ReactPropTypes.js b/src/isomorphic/classic/types/ReactPropTypes.js
index 6f749170bc..6cd3c04d93 100644
--- a/src/isomorphic/classic/types/ReactPropTypes.js
+++ b/src/isomorphic/classic/types/ReactPropTypes.js
@@ -14,10 +14,10 @@
var ReactElement = require('ReactElement');
var ReactPropTypesSecret = require('ReactPropTypesSecret');
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
var getIteratorFn = require('getIteratorFn');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
/**
* Collection of methods that allow declaration and validation of props that are
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
index 8ed0aa07ec..64dbe07ba3 100644
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
+++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -110,8 +110,8 @@ function expectWarningInDevelopment(declaration, value) {
describe('ReactPropTypes', () => {
beforeEach(() => {
PropTypes = require('ReactPropTypes');
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactFragment = require('ReactFragment');
resetWarningCache();
});
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
index 8e6a868c9f..07a46a8774 100644
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
+++ b/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
@@ -30,7 +30,7 @@ describe('ReactPropTypesProduction', function() {
jest.resetModules();
PropTypes = require('ReactPropTypes');
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/isomorphic/classic/types/checkPropTypes.js b/src/isomorphic/classic/types/checkPropTypes.js
index 23ebacaf09..5779168684 100644
--- a/src/isomorphic/classic/types/checkPropTypes.js
+++ b/src/isomorphic/classic/types/checkPropTypes.js
@@ -13,8 +13,8 @@
var ReactPropTypesSecret = require('ReactPropTypesSecret');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
var loggedTypeFailures = {};
diff --git a/src/isomorphic/hooks/ReactComponentTreeHook.js b/src/isomorphic/hooks/ReactComponentTreeHook.js
index b7d253df86..2359fd1c34 100644
--- a/src/isomorphic/hooks/ReactComponentTreeHook.js
+++ b/src/isomorphic/hooks/ReactComponentTreeHook.js
@@ -22,8 +22,8 @@ var {
} = ReactTypeOfWork;
var getComponentName = require('getComponentName');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
import type { ReactElement, Source } from 'ReactElementType';
import type { DebugID } from 'ReactInstanceType';
diff --git a/src/isomorphic/modern/class/React.d.ts b/src/isomorphic/modern/class/React.d.ts
index 90e76c52d5..4b0613cfff 100644
--- a/src/isomorphic/modern/class/React.d.ts
+++ b/src/isomorphic/modern/class/React.d.ts
@@ -14,7 +14,7 @@
* just helpers for the unit test.
*/
-declare module 'React' {
+declare module 'react' {
export class Component {
props: any;
state: any;
diff --git a/src/isomorphic/modern/class/ReactBaseClasses.js b/src/isomorphic/modern/class/ReactBaseClasses.js
index 506840289e..3353461fe0 100644
--- a/src/isomorphic/modern/class/ReactBaseClasses.js
+++ b/src/isomorphic/modern/class/ReactBaseClasses.js
@@ -14,9 +14,9 @@
var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');
var canDefineProperty = require('canDefineProperty');
-var emptyObject = require('emptyObject');
-var invariant = require('invariant');
-var warning = require('warning');
+var emptyObject = require('fbjs/lib/emptyObject');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
/**
* Base class helpers for the updating state of a component.
diff --git a/src/isomorphic/modern/class/ReactDOM.d.ts b/src/isomorphic/modern/class/ReactDOM.d.ts
index 477cc76fd4..cb4936ab4d 100644
--- a/src/isomorphic/modern/class/ReactDOM.d.ts
+++ b/src/isomorphic/modern/class/ReactDOM.d.ts
@@ -14,7 +14,7 @@
* just helpers for the unit test.
*/
-declare module 'ReactDOM' {
+declare module 'react-dom' {
export function render(element : any, container : any) : any
export function unmountComponentAtNode(container : any) : void
export function findDOMNode(instance : any) : any
diff --git a/src/isomorphic/modern/class/ReactNoopUpdateQueue.js b/src/isomorphic/modern/class/ReactNoopUpdateQueue.js
index 949ed73ca6..41e8ee95e3 100644
--- a/src/isomorphic/modern/class/ReactNoopUpdateQueue.js
+++ b/src/isomorphic/modern/class/ReactNoopUpdateQueue.js
@@ -11,7 +11,7 @@
'use strict';
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
function warnNoop(publicInstance, callerName) {
if (__DEV__) {
diff --git a/src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee b/src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee
index de03d875b0..1880a3dc6e 100644
--- a/src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee
+++ b/src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee
@@ -19,8 +19,8 @@ describe 'ReactCoffeeScriptClass', ->
renderedName = null;
beforeEach ->
- React = require 'React'
- ReactDOM = require 'ReactDOM'
+ React = require 'react'
+ ReactDOM = require 'react-dom'
container = document.createElement 'div'
attachedListener = null
renderedName = null
diff --git a/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js b/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
index ca34089157..a0d80519ac 100644
--- a/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
+++ b/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
@@ -26,8 +26,8 @@ describe('ReactES6Class', () => {
var renderedName = null;
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
container = document.createElement('div');
attachedListener = null;
renderedName = null;
diff --git a/src/isomorphic/modern/class/__tests__/ReactPureComponent-test.js b/src/isomorphic/modern/class/__tests__/ReactPureComponent-test.js
index 1235a1ea82..9407d17a0c 100644
--- a/src/isomorphic/modern/class/__tests__/ReactPureComponent-test.js
+++ b/src/isomorphic/modern/class/__tests__/ReactPureComponent-test.js
@@ -16,8 +16,8 @@ var ReactDOM;
describe('ReactPureComponent', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
});
it('should render', () => {
diff --git a/src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts b/src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts
index 6ef95ccaa3..921474d3af 100644
--- a/src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts
+++ b/src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts
@@ -10,8 +10,8 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/
-import React = require('React');
-import ReactDOM = require('ReactDOM');
+import React = require('react');
+import ReactDOM = require('react-dom');
// Before Each
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
index abb4bf2d3b..481fa625ba 100644
--- a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
+++ b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
@@ -21,8 +21,8 @@ describe('ReactJSXElement', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
Component = class extends React.Component {
render() {
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
index e29b8acd16..4dcc8c25cb 100644
--- a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
+++ b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
@@ -29,8 +29,8 @@ describe('ReactJSXElementValidator', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
Component = class extends React.Component {
diff --git a/src/node_modules/README.md b/src/node_modules/README.md
new file mode 100644
index 0000000000..5df19b2eae
--- /dev/null
+++ b/src/node_modules/README.md
@@ -0,0 +1,3 @@
+# Forwarding Modules
+
+This directory defines modules that normally exist on npm but replaces them with forwarding modules that point to our internal providesModule files.
diff --git a/src/node_modules/react-dom/index.js b/src/node_modules/react-dom/index.js
new file mode 100644
index 0000000000..2cee4e3abe
--- /dev/null
+++ b/src/node_modules/react-dom/index.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactDOM');
diff --git a/src/node_modules/react-dom/lib/ReactDOM.js b/src/node_modules/react-dom/lib/ReactDOM.js
new file mode 100644
index 0000000000..2cee4e3abe
--- /dev/null
+++ b/src/node_modules/react-dom/lib/ReactDOM.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactDOM');
diff --git a/src/node_modules/react-dom/lib/ReactDOMServer.js b/src/node_modules/react-dom/lib/ReactDOMServer.js
new file mode 100644
index 0000000000..e02fa01f40
--- /dev/null
+++ b/src/node_modules/react-dom/lib/ReactDOMServer.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactDOMServer');
diff --git a/src/node_modules/react-dom/lib/ReactInstanceMap.js b/src/node_modules/react-dom/lib/ReactInstanceMap.js
new file mode 100644
index 0000000000..7e3afdf6cd
--- /dev/null
+++ b/src/node_modules/react-dom/lib/ReactInstanceMap.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactInstanceMap');
diff --git a/src/node_modules/react-dom/lib/ReactPerf.js b/src/node_modules/react-dom/lib/ReactPerf.js
new file mode 100644
index 0000000000..a0793939a1
--- /dev/null
+++ b/src/node_modules/react-dom/lib/ReactPerf.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactPerf');
diff --git a/src/node_modules/react-dom/lib/ReactTestUtils.js b/src/node_modules/react-dom/lib/ReactTestUtils.js
new file mode 100644
index 0000000000..ef0d67875e
--- /dev/null
+++ b/src/node_modules/react-dom/lib/ReactTestUtils.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactTestUtils');
diff --git a/src/node_modules/react-dom/lib/getVendorPrefixedEventName.js b/src/node_modules/react-dom/lib/getVendorPrefixedEventName.js
new file mode 100644
index 0000000000..68c931aa49
--- /dev/null
+++ b/src/node_modules/react-dom/lib/getVendorPrefixedEventName.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('getVendorPrefixedEventName');
diff --git a/src/node_modules/react-dom/server.js b/src/node_modules/react-dom/server.js
new file mode 100644
index 0000000000..e02fa01f40
--- /dev/null
+++ b/src/node_modules/react-dom/server.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactDOMServer');
diff --git a/src/node_modules/react/index.js b/src/node_modules/react/index.js
new file mode 100644
index 0000000000..3566a38179
--- /dev/null
+++ b/src/node_modules/react/index.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('React');
diff --git a/src/node_modules/react/lib/ReactComponentTreeHook.js b/src/node_modules/react/lib/ReactComponentTreeHook.js
new file mode 100644
index 0000000000..fe857e7bae
--- /dev/null
+++ b/src/node_modules/react/lib/ReactComponentTreeHook.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactComponentTreeHook');
diff --git a/src/node_modules/react/lib/ReactCurrentOwner.js b/src/node_modules/react/lib/ReactCurrentOwner.js
new file mode 100644
index 0000000000..54ae79f8db
--- /dev/null
+++ b/src/node_modules/react/lib/ReactCurrentOwner.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactCurrentOwner');
diff --git a/src/node_modules/react/lib/ReactDebugCurrentFrame.js b/src/node_modules/react/lib/ReactDebugCurrentFrame.js
new file mode 100644
index 0000000000..79df089683
--- /dev/null
+++ b/src/node_modules/react/lib/ReactDebugCurrentFrame.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('ReactDebugCurrentFrame');
diff --git a/src/node_modules/react/lib/checkPropTypes.js b/src/node_modules/react/lib/checkPropTypes.js
new file mode 100644
index 0000000000..083e4df83a
--- /dev/null
+++ b/src/node_modules/react/lib/checkPropTypes.js
@@ -0,0 +1,9 @@
+/**
+ * Copyright 2016-present Facebook. All Rights Reserved.
+ *
+ * @flow
+ */
+
+'use strict';
+
+module.exports = require('checkPropTypes');
diff --git a/src/renderers/__tests__/EventPluginHub-test.js b/src/renderers/__tests__/EventPluginHub-test.js
index 7baf3d28e5..54cd8498f1 100644
--- a/src/renderers/__tests__/EventPluginHub-test.js
+++ b/src/renderers/__tests__/EventPluginHub-test.js
@@ -19,7 +19,7 @@ describe('EventPluginHub', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/__tests__/ReactChildReconciler-test.js b/src/renderers/__tests__/ReactChildReconciler-test.js
index ef2faa32ff..5ea955eaa5 100644
--- a/src/renderers/__tests__/ReactChildReconciler-test.js
+++ b/src/renderers/__tests__/ReactChildReconciler-test.js
@@ -25,7 +25,7 @@ describe('ReactChildReconciler', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/__tests__/ReactComponent-test.js b/src/renderers/__tests__/ReactComponent-test.js
index bdc0e823a5..91598c4ab0 100644
--- a/src/renderers/__tests__/ReactComponent-test.js
+++ b/src/renderers/__tests__/ReactComponent-test.js
@@ -18,8 +18,8 @@ var ReactTestUtils;
describe('ReactComponent', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
index ae512f1b53..9d0d317d22 100644
--- a/src/renderers/__tests__/ReactComponentLifeCycle-test.js
+++ b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
@@ -92,8 +92,8 @@ function getLifeCycleState(instance): ComponentLifeCycle {
describe('ReactComponentLifeCycle', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/__tests__/ReactComponentTreeHook-test.js b/src/renderers/__tests__/ReactComponentTreeHook-test.js
index db281517a4..a9c19c13eb 100644
--- a/src/renderers/__tests__/ReactComponentTreeHook-test.js
+++ b/src/renderers/__tests__/ReactComponentTreeHook-test.js
@@ -22,11 +22,11 @@ describe('ReactComponentTreeHook', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
ReactInstanceMap = require('ReactInstanceMap');
- ReactComponentTreeHook = require('ReactComponentTreeHook');
+ ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');
});
@@ -1886,11 +1886,11 @@ describe('ReactComponentTreeHook', () => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
ReactInstanceMap = require('ReactInstanceMap');
- ReactComponentTreeHook = require('ReactComponentTreeHook');
+ ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');
});
diff --git a/src/renderers/__tests__/ReactComponentTreeHook-test.native.js b/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
index bfc494f414..23c934c274 100644
--- a/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
+++ b/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
@@ -25,10 +25,10 @@ describe('ReactComponentTreeHook', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNative = require('ReactNative');
ReactInstanceMap = require('ReactInstanceMap');
- ReactComponentTreeHook = require('ReactComponentTreeHook');
+ ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');
View = require('View');
createReactNativeComponentClass = require('createReactNativeComponentClass');
diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js
index 6346ff739d..29953610e0 100644
--- a/src/renderers/__tests__/ReactCompositeComponent-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponent-test.js
@@ -25,11 +25,11 @@ describe('ReactCompositeComponent', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
- ReactDOMServer = require('ReactDOMServer');
- ReactCurrentOwner = require('ReactCurrentOwner');
+ ReactDOMServer = require('react-dom/server');
+ ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
ReactPropTypes = require('ReactPropTypes');
ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js b/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js
index 499295f3b2..aa9972a161 100644
--- a/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponentDOMMinimalism-test.js
@@ -30,8 +30,8 @@ var expectSingleChildlessDiv;
describe('ReactCompositeComponentDOMMinimalism', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
LowerLevelComposite = class extends React.Component {
diff --git a/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js b/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js
index 1c95f72293..a0eba24154 100644
--- a/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponentNestedState-test.js
@@ -18,8 +18,8 @@ var ReactTestUtils;
describe('ReactCompositeComponentNestedState-state', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/__tests__/ReactCompositeComponentState-test.js b/src/renderers/__tests__/ReactCompositeComponentState-test.js
index 46ec0f1fe4..9aa97f2646 100644
--- a/src/renderers/__tests__/ReactCompositeComponentState-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponentState-test.js
@@ -20,9 +20,9 @@ var TestComponent;
describe('ReactCompositeComponent-state', () => {
beforeEach(() => {
- React = require('React');
+ React = require('react');
- ReactDOM = require('ReactDOM');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
TestComponent = React.createClass({
diff --git a/src/renderers/__tests__/ReactEmptyComponent-test.js b/src/renderers/__tests__/ReactEmptyComponent-test.js
index ac2c884ec9..d9985d24dd 100644
--- a/src/renderers/__tests__/ReactEmptyComponent-test.js
+++ b/src/renderers/__tests__/ReactEmptyComponent-test.js
@@ -23,8 +23,8 @@ describe('ReactEmptyComponent', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/__tests__/ReactErrorBoundaries-test.js b/src/renderers/__tests__/ReactErrorBoundaries-test.js
index 8110aa9e60..5bac8b1a5f 100644
--- a/src/renderers/__tests__/ReactErrorBoundaries-test.js
+++ b/src/renderers/__tests__/ReactErrorBoundaries-test.js
@@ -37,8 +37,8 @@ describe('ReactErrorBoundaries', () => {
var Normal;
beforeEach(() => {
- ReactDOM = require('ReactDOM');
- React = require('React');
+ ReactDOM = require('react-dom');
+ React = require('react');
log = [];
diff --git a/src/renderers/__tests__/ReactHostOperationHistoryHook-test.js b/src/renderers/__tests__/ReactHostOperationHistoryHook-test.js
index b97ac0961c..b830342b75 100644
--- a/src/renderers/__tests__/ReactHostOperationHistoryHook-test.js
+++ b/src/renderers/__tests__/ReactHostOperationHistoryHook-test.js
@@ -22,9 +22,9 @@ describe('ReactHostOperationHistoryHook', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactPerf = require('ReactPerf');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactPerf = require('react-dom/lib/ReactPerf');
+ ReactDOM = require('react-dom');
ReactDOMComponentTree = require('ReactDOMComponentTree');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook');
diff --git a/src/renderers/__tests__/ReactIdentity-test.js b/src/renderers/__tests__/ReactIdentity-test.js
index e5195dad5e..bb82a9d611 100644
--- a/src/renderers/__tests__/ReactIdentity-test.js
+++ b/src/renderers/__tests__/ReactIdentity-test.js
@@ -20,8 +20,8 @@ describe('ReactIdentity', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactFragment = require('ReactFragment');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/__tests__/ReactMockedComponent-test.js b/src/renderers/__tests__/ReactMockedComponent-test.js
index 213925915f..bb924cfbe2 100644
--- a/src/renderers/__tests__/ReactMockedComponent-test.js
+++ b/src/renderers/__tests__/ReactMockedComponent-test.js
@@ -20,7 +20,7 @@ var MockedComponent;
describe('ReactMockedComponent', () => {
beforeEach(() => {
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
AutoMockedComponent = jest.genMockFromModule('ReactMockedComponentTestComponent');
diff --git a/src/renderers/__tests__/ReactMultiChild-test.js b/src/renderers/__tests__/ReactMultiChild-test.js
index 42d7f4296f..3fee4e0915 100644
--- a/src/renderers/__tests__/ReactMultiChild-test.js
+++ b/src/renderers/__tests__/ReactMultiChild-test.js
@@ -22,8 +22,8 @@ describe('ReactMultiChild', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
});
diff --git a/src/renderers/__tests__/ReactMultiChildReconcile-test.js b/src/renderers/__tests__/ReactMultiChildReconcile-test.js
index 821da6af2a..b8d7b94e3a 100644
--- a/src/renderers/__tests__/ReactMultiChildReconcile-test.js
+++ b/src/renderers/__tests__/ReactMultiChildReconcile-test.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var stripEmptyValues = function(obj) {
var ret = {};
diff --git a/src/renderers/__tests__/ReactMultiChildText-test.js b/src/renderers/__tests__/ReactMultiChildText-test.js
index 2a63cb5e12..c819ae3343 100644
--- a/src/renderers/__tests__/ReactMultiChildText-test.js
+++ b/src/renderers/__tests__/ReactMultiChildText-test.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
var ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/__tests__/ReactPerf-test.js b/src/renderers/__tests__/ReactPerf-test.js
index b314d93f81..7d5cb809c2 100644
--- a/src/renderers/__tests__/ReactPerf-test.js
+++ b/src/renderers/__tests__/ReactPerf-test.js
@@ -34,11 +34,11 @@ describe('ReactPerf', () => {
console.table.isFake = true;
}
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactPerf = require('ReactPerf');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactPerf = require('react-dom/lib/ReactPerf');
ReactTestUtils = require('ReactTestUtils');
- emptyFunction = require('emptyFunction');
+ emptyFunction = require('fbjs/lib/emptyFunction');
App = class extends React.Component {
render() {
diff --git a/src/renderers/__tests__/ReactStateSetters-test.js b/src/renderers/__tests__/ReactStateSetters-test.js
index 34e13cafac..dcc22a743b 100644
--- a/src/renderers/__tests__/ReactStateSetters-test.js
+++ b/src/renderers/__tests__/ReactStateSetters-test.js
@@ -11,7 +11,7 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactStateSetters = require('ReactStateSetters');
var ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/__tests__/ReactStatelessComponent-test.js b/src/renderers/__tests__/ReactStatelessComponent-test.js
index 249b17acd3..123f1e3858 100644
--- a/src/renderers/__tests__/ReactStatelessComponent-test.js
+++ b/src/renderers/__tests__/ReactStatelessComponent-test.js
@@ -28,8 +28,8 @@ describe('ReactStatelessComponent', () => {
beforeEach(() => {
jest.resetModuleRegistry();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/__tests__/ReactTreeTraversal-test.js b/src/renderers/__tests__/ReactTreeTraversal-test.js
index a37ada869e..c48ce021cb 100644
--- a/src/renderers/__tests__/ReactTreeTraversal-test.js
+++ b/src/renderers/__tests__/ReactTreeTraversal-test.js
@@ -11,7 +11,7 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/__tests__/ReactUpdates-test.js b/src/renderers/__tests__/ReactUpdates-test.js
index bbe0fc47cb..6ec60de938 100644
--- a/src/renderers/__tests__/ReactUpdates-test.js
+++ b/src/renderers/__tests__/ReactUpdates-test.js
@@ -19,8 +19,8 @@ var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
describe('ReactUpdates', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
ReactTestUtils = require('ReactTestUtils');
ReactUpdates = require('ReactUpdates');
diff --git a/src/renderers/__tests__/refs-destruction-test.js b/src/renderers/__tests__/refs-destruction-test.js
index 2ae242fa3c..7f6575f644 100644
--- a/src/renderers/__tests__/refs-destruction-test.js
+++ b/src/renderers/__tests__/refs-destruction-test.js
@@ -21,8 +21,8 @@ describe('refs-destruction', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
TestComponent = class extends React.Component {
diff --git a/src/renderers/__tests__/refs-test.js b/src/renderers/__tests__/refs-test.js
index d94d200c99..05420bbdca 100644
--- a/src/renderers/__tests__/refs-test.js
+++ b/src/renderers/__tests__/refs-test.js
@@ -11,7 +11,7 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
var ReactTestUtils = require('ReactTestUtils');
@@ -112,7 +112,7 @@ var expectClickLogsLengthToBe = function(instance, length) {
describe('reactiverefs', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
});
@@ -169,7 +169,7 @@ describe('ref swapping', () => {
let RefHopsAround;
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
RefHopsAround = class extends React.Component {
@@ -305,14 +305,14 @@ describe('ref swapping', () => {
describe('string refs between fiber and stack', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
});
it('attaches, detaches from fiber component with stack layer', () => {
spyOn(console, 'error');
- const ReactCurrentOwner = require('ReactCurrentOwner');
- const ReactDOM = require('ReactDOM');
+ const ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
+ const ReactDOM = require('react-dom');
const ReactDOMFiber = require('ReactDOMFiber');
const ReactInstanceMap = require('ReactInstanceMap');
let layerMounted = false;
@@ -358,8 +358,8 @@ describe('string refs between fiber and stack', () => {
it('attaches, detaches from stack component with fiber layer', () => {
spyOn(console, 'error');
- const ReactCurrentOwner = require('ReactCurrentOwner');
- const ReactDOM = require('ReactDOM');
+ const ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
+ const ReactDOM = require('react-dom');
const ReactDOMFiber = require('ReactDOMFiber');
const ReactInstanceMap = require('ReactInstanceMap');
let layerMounted = false;
diff --git a/src/renderers/art/ReactARTFiber.js b/src/renderers/art/ReactARTFiber.js
index ebc81ce1f7..2c2705929d 100644
--- a/src/renderers/art/ReactARTFiber.js
+++ b/src/renderers/art/ReactARTFiber.js
@@ -18,8 +18,8 @@ require('art/modes/current').setCurrent(
const Mode = require('art/modes/current');
const Transform = require('art/core/transform');
const invariant = require('fbjs/lib/invariant');
-const emptyObject = require('emptyObject');
-const React = require('React');
+const emptyObject = require('fbjs/lib/emptyObject');
+const React = require('react');
const ReactFiberReconciler = require('ReactFiberReconciler');
const ReactDOMFrameScheduling = require('ReactDOMFrameScheduling');
diff --git a/src/renderers/art/ReactARTStack.js b/src/renderers/art/ReactARTStack.js
index 0c17c71473..5caf3d82de 100644
--- a/src/renderers/art/ReactARTStack.js
+++ b/src/renderers/art/ReactARTStack.js
@@ -18,14 +18,14 @@ require('art/modes/current').setCurrent(
const Transform = require('art/core/transform');
const Mode = require('art/modes/current');
-const React = require('React');
-const ReactDOM = require('ReactDOM');
+const React = require('react');
+const ReactDOM = require('react-dom');
const ReactInstanceMap = require('ReactInstanceMap');
const ReactMultiChild = require('ReactMultiChild');
const ReactUpdates = require('ReactUpdates');
-const emptyObject = require('emptyObject');
-const invariant = require('invariant');
+const emptyObject = require('fbjs/lib/emptyObject');
+const invariant = require('fbjs/lib/invariant');
const assign = require('object-assign');
const pooledTransform = new Transform();
diff --git a/src/renderers/art/__tests__/ReactART-test.js b/src/renderers/art/__tests__/ReactART-test.js
index f628627adb..fb0ec3cdc2 100644
--- a/src/renderers/art/__tests__/ReactART-test.js
+++ b/src/renderers/art/__tests__/ReactART-test.js
@@ -13,8 +13,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var ReactTestUtils = require('ReactTestUtils');
var Group;
diff --git a/src/renderers/dom/ReactDOM.js b/src/renderers/dom/ReactDOM.js
index ae15adad24..54ac7783b4 100644
--- a/src/renderers/dom/ReactDOM.js
+++ b/src/renderers/dom/ReactDOM.js
@@ -23,7 +23,7 @@ var ReactVersion = require('ReactVersion');
var findDOMNode = require('findDOMNode');
var getHostComponentFromComposite = require('getHostComponentFromComposite');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
ReactDOMInjection.inject();
ReactDOMStackInjection.inject();
@@ -67,7 +67,7 @@ if (
}
if (__DEV__) {
- var ExecutionEnvironment = require('ExecutionEnvironment');
+ var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
if (ExecutionEnvironment.canUseDOM && window.top === window.self) {
// First check if devtools is not installed
diff --git a/src/renderers/dom/__tests__/ReactDOMProduction-test.js b/src/renderers/dom/__tests__/ReactDOMProduction-test.js
index aba6fc4ff9..22a2ef337b 100644
--- a/src/renderers/dom/__tests__/ReactDOMProduction-test.js
+++ b/src/renderers/dom/__tests__/ReactDOMProduction-test.js
@@ -29,8 +29,8 @@ describe('ReactDOMProduction', () => {
};
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
});
afterEach(() => {
@@ -39,7 +39,7 @@ describe('ReactDOMProduction', () => {
});
it('should use prod fbjs', () => {
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
spyOn(console, 'error');
warning(false, 'Do cows go moo?');
@@ -208,8 +208,8 @@ describe('ReactDOMProduction', () => {
supportsFiber: true,
};
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
class Component extends React.Component {
render() {
return
;
diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index cebe041481..7ccd95dd8d 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -28,12 +28,12 @@ var ReactFiberReconciler = require('ReactFiberReconciler');
var ReactInputSelection = require('ReactInputSelection');
var ReactInstanceMap = require('ReactInstanceMap');
var ReactPortal = require('ReactPortal');
-var { isValidElement } = require('React');
+var { isValidElement } = require('react');
var { injectInternals } = require('ReactFiberDevToolsHook');
var findDOMNode = require('findDOMNode');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
var {
createElement,
diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index d255aac836..07123d2ffa 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -26,13 +26,13 @@ var ReactDOMFiberSelect = require('ReactDOMFiberSelect');
var ReactDOMFiberTextarea = require('ReactDOMFiberTextarea');
var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');
-var emptyFunction = require('emptyFunction');
-var invariant = require('invariant');
+var emptyFunction = require('fbjs/lib/emptyFunction');
+var invariant = require('fbjs/lib/invariant');
var isEventSupported = require('isEventSupported');
var setInnerHTML = require('setInnerHTML');
var setTextContent = require('setTextContent');
var inputValueTracking = require('inputValueTracking');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
if (__DEV__) {
var ReactDOMInvalidARIAHook = require('ReactDOMInvalidARIAHook');
diff --git a/src/renderers/dom/fiber/ReactDOMFrameScheduling.js b/src/renderers/dom/fiber/ReactDOMFrameScheduling.js
index 2ef1d331e3..f6ba6f2b7b 100644
--- a/src/renderers/dom/fiber/ReactDOMFrameScheduling.js
+++ b/src/renderers/dom/fiber/ReactDOMFrameScheduling.js
@@ -22,7 +22,7 @@
import type { Deadline } from 'ReactFiberReconciler';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
// TODO: There's no way to cancel these, because Fiber doesn't atm.
let rAF : (callback : (time : number) => void) => number;
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
index e5873643bd..abe13de022 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
var ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
index 0c34e13744..36be73bac9 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
@@ -25,8 +25,8 @@ var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
var didWarnValueDefaultValue = false;
var didWarnCheckedDefaultChecked = false;
diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js
index 6df60d3162..82b4dc62e2 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberOption.js
@@ -12,9 +12,9 @@
'use strict';
-var React = require('React');
+var React = require('react');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
function flattenChildren(children) {
var content = '';
diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
index 88853b3014..aea299a353 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
@@ -21,7 +21,7 @@ type SelectWithWrapperState = HTMLSelectElement & {
var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var didWarnValueDefaultValue = false;
diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js
index 49433ff5a1..7f72e706a2 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js
@@ -21,8 +21,8 @@ type TextAreaWithWrapperState = HTMLTextAreaElement & {
var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
var didWarnValDefaultVal = false;
diff --git a/src/renderers/dom/shared/CSSPropertyOperations.js b/src/renderers/dom/shared/CSSPropertyOperations.js
index 81858e997b..3150be9220 100644
--- a/src/renderers/dom/shared/CSSPropertyOperations.js
+++ b/src/renderers/dom/shared/CSSPropertyOperations.js
@@ -12,14 +12,14 @@
'use strict';
var CSSProperty = require('CSSProperty');
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
-var camelizeStyleName = require('camelizeStyleName');
+var camelizeStyleName = require('fbjs/lib/camelizeStyleName');
var dangerousStyleValue = require('dangerousStyleValue');
var getComponentName = require('getComponentName');
-var hyphenateStyleName = require('hyphenateStyleName');
-var memoizeStringOnly = require('memoizeStringOnly');
-var warning = require('warning');
+var hyphenateStyleName = require('fbjs/lib/hyphenateStyleName');
+var memoizeStringOnly = require('fbjs/lib/memoizeStringOnly');
+var warning = require('fbjs/lib/warning');
if (__DEV__) {
var { getCurrentFiberOwnerName } = require('ReactDebugCurrentFiber');
diff --git a/src/renderers/dom/shared/DOMProperty.js b/src/renderers/dom/shared/DOMProperty.js
index 8496fb7acf..7cabf6fe4c 100644
--- a/src/renderers/dom/shared/DOMProperty.js
+++ b/src/renderers/dom/shared/DOMProperty.js
@@ -11,7 +11,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
function checkMask(value, bitmask) {
return (value & bitmask) === bitmask;
diff --git a/src/renderers/dom/shared/DOMPropertyOperations.js b/src/renderers/dom/shared/DOMPropertyOperations.js
index aa8010640c..0faba1e685 100644
--- a/src/renderers/dom/shared/DOMPropertyOperations.js
+++ b/src/renderers/dom/shared/DOMPropertyOperations.js
@@ -16,7 +16,7 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactInstrumentation = require('ReactInstrumentation');
var quoteAttributeValueForBrowser = require('quoteAttributeValueForBrowser');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var VALID_ATTRIBUTE_NAME_REGEX = new RegExp(
'^[' + DOMProperty.ATTRIBUTE_NAME_START_CHAR + '][' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$'
diff --git a/src/renderers/dom/shared/ReactDOMComponentTree.js b/src/renderers/dom/shared/ReactDOMComponentTree.js
index 78c543bea2..6743a89fc6 100644
--- a/src/renderers/dom/shared/ReactDOMComponentTree.js
+++ b/src/renderers/dom/shared/ReactDOMComponentTree.js
@@ -15,7 +15,7 @@ var DOMProperty = require('DOMProperty');
var ReactDOMComponentFlags = require('ReactDOMComponentFlags');
var { HostComponent, HostText } = require('ReactTypeOfWork');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;
var Flags = ReactDOMComponentFlags;
diff --git a/src/renderers/dom/shared/ReactDOMSelection.js b/src/renderers/dom/shared/ReactDOMSelection.js
index aff9e894bb..d4906d69ea 100644
--- a/src/renderers/dom/shared/ReactDOMSelection.js
+++ b/src/renderers/dom/shared/ReactDOMSelection.js
@@ -11,7 +11,7 @@
'use strict';
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var getNodeForCharacterOffset = require('getNodeForCharacterOffset');
var getTextContentAccessor = require('getTextContentAccessor');
diff --git a/src/renderers/dom/shared/ReactEventListener.js b/src/renderers/dom/shared/ReactEventListener.js
index 9c33a3714e..d928846af6 100644
--- a/src/renderers/dom/shared/ReactEventListener.js
+++ b/src/renderers/dom/shared/ReactEventListener.js
@@ -11,15 +11,15 @@
'use strict';
-var EventListener = require('EventListener');
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var EventListener = require('fbjs/lib/EventListener');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var PooledClass = require('PooledClass');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactGenericBatching = require('ReactGenericBatching');
var ReactTypeOfWork = require('ReactTypeOfWork');
var getEventTarget = require('getEventTarget');
-var getUnboundedScrollPosition = require('getUnboundedScrollPosition');
+var getUnboundedScrollPosition = require('fbjs/lib/getUnboundedScrollPosition');
var { HostRoot } = ReactTypeOfWork;
diff --git a/src/renderers/dom/shared/ReactInputSelection.js b/src/renderers/dom/shared/ReactInputSelection.js
index f95b5b2552..92c1cfe56b 100644
--- a/src/renderers/dom/shared/ReactInputSelection.js
+++ b/src/renderers/dom/shared/ReactInputSelection.js
@@ -13,9 +13,9 @@
var ReactDOMSelection = require('ReactDOMSelection');
-var containsNode = require('containsNode');
-var focusNode = require('focusNode');
-var getActiveElement = require('getActiveElement');
+var containsNode = require('fbjs/lib/containsNode');
+var focusNode = require('fbjs/lib/focusNode');
+var getActiveElement = require('fbjs/lib/getActiveElement');
function isInDocument(node) {
return containsNode(document.documentElement, node);
diff --git a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
index 0676d9d453..11d67679c4 100644
--- a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
@@ -11,9 +11,9 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
-var ReactDOMServer = require('ReactDOMServer');
+var React = require('react');
+var ReactDOM = require('react-dom');
+var ReactDOMServer = require('react-dom/server');
describe('CSSPropertyOperations', () => {
var CSSPropertyOperations;
diff --git a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
index 9ba9e36a2b..0c136beec2 100644
--- a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
@@ -59,11 +59,11 @@ describe('ReactBrowserEventEmitter', () => {
beforeEach(() => {
jest.resetModules();
LISTENER.mockClear();
- EventListener = require('EventListener');
+ EventListener = require('fbjs/lib/EventListener');
EventPluginHub = require('EventPluginHub');
EventPluginRegistry = require('EventPluginRegistry');
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMComponentTree = require('ReactDOMComponentTree');
ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/dom/shared/__tests__/ReactDOM-test.js b/src/renderers/dom/shared/__tests__/ReactDOM-test.js
index 5da34e3824..eda3d31517 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOM-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOM-test.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var ReactTestUtils = require('ReactTestUtils');
describe('ReactDOM', () => {
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index 24232bd782..347e57c987 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -26,10 +26,10 @@ describe('ReactDOMComponent', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
- ReactDOMServer = require('ReactDOMServer');
+ ReactDOMServer = require('react-dom/server');
ReactTestUtils = require('ReactTestUtils');
inputValueTracking = require('inputValueTracking');
});
@@ -1102,7 +1102,7 @@ describe('ReactDOMComponent', () => {
expect(ReactDOMServer.renderToString()).toContain('is="custom-div"');
}
});
-
+
it('should work load and error events on element in SVG', () => {
spyOn(console, 'log');
var container = document.createElement('div');
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js
index 9c35e59390..4ca52fc636 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponentTree-test.js
@@ -39,10 +39,10 @@ describe('ReactDOMComponentTree', () => {
}
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMComponentTree = require('ReactDOMComponentTree');
- ReactDOMServer = require('ReactDOMServer');
+ ReactDOMServer = require('react-dom/server');
});
it('finds nodes for instances', () => {
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js b/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js
index 8c47c13918..c3e997f4cb 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMInvalidARIAHook-test.js
@@ -18,7 +18,7 @@ describe('ReactDOMInvalidARIAHook', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
mountComponent = function(props) {
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js b/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js
index b2b4139414..dbc926f3e8 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js
@@ -19,10 +19,10 @@ var ReactDOMServer;
describe('ReactDOMSVG', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
- ReactDOMServer = require('ReactDOMServer');
+ ReactDOMServer = require('react-dom/server');
});
it('creates initial namespaced markup', () => {
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
index 338c899914..649c6ec2d5 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
@@ -26,9 +26,9 @@ function filterOutComments(nodeList) {
describe('ReactDOMTextComponent', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
});
it('updates a mounted text component in place', () => {
diff --git a/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js b/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
index 0ffd6da29f..79143a8336 100644
--- a/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactEventIndependence-test.js
@@ -19,8 +19,8 @@ describe('ReactEventIndependence', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/dom/shared/__tests__/ReactEventListener-test.js b/src/renderers/dom/shared/__tests__/ReactEventListener-test.js
index fb60833dfb..e0f1a9bf3b 100644
--- a/src/renderers/dom/shared/__tests__/ReactEventListener-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactEventListener-test.js
@@ -24,8 +24,8 @@ describe('ReactEventListener', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMComponentTree = require('ReactDOMComponentTree');
ReactEventListener = require('ReactEventListener');
ReactTestUtils = require('ReactTestUtils');
diff --git a/src/renderers/dom/shared/__tests__/ReactMount-test.js b/src/renderers/dom/shared/__tests__/ReactMount-test.js
index 76271791f4..3cba843554 100644
--- a/src/renderers/dom/shared/__tests__/ReactMount-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactMount-test.js
@@ -22,9 +22,9 @@ describe('ReactMount', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
ReactMount = require('ReactMount');
ReactTestUtils = require('ReactTestUtils');
@@ -231,7 +231,7 @@ describe('ReactMount', () => {
it('should warn if the unmounted node was rendered by another copy of React', () => {
jest.resetModules();
- var ReactDOMOther = require('ReactDOM');
+ var ReactDOMOther = require('react-dom');
var container = document.createElement('div');
class Component extends React.Component {
diff --git a/src/renderers/dom/shared/__tests__/ReactMountDestruction-test.js b/src/renderers/dom/shared/__tests__/ReactMountDestruction-test.js
index f41c7def8a..b64dec7be3 100644
--- a/src/renderers/dom/shared/__tests__/ReactMountDestruction-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactMountDestruction-test.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
describe('ReactMount', () => {
it('should destroy a react root upon request', () => {
diff --git a/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js b/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js
index 8b1fe4dec0..abcee78905 100644
--- a/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js
@@ -30,9 +30,9 @@ describe('rendering React components at document', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
getTestDocument = require('getTestDocument');
testDocument = getTestDocument();
diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index 5dca8f2616..93cb1cf62f 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -26,16 +26,16 @@ var ROOT_ATTRIBUTE_NAME;
describe('ReactDOMServer', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
ReactMarkupChecksum = require('ReactMarkupChecksum');
ReactTestUtils = require('ReactTestUtils');
ReactReconcileTransaction = require('ReactReconcileTransaction');
- ExecutionEnvironment = require('ExecutionEnvironment');
+ ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
ExecutionEnvironment.canUseDOM = false;
- ReactDOMServer = require('ReactDOMServer');
+ ReactDOMServer = require('react-dom/server');
var DOMProperty = require('DOMProperty');
ID_ATTRIBUTE_NAME = DOMProperty.ID_ATTRIBUTE_NAME;
diff --git a/src/renderers/dom/shared/__tests__/findDOMNode-test.js b/src/renderers/dom/shared/__tests__/findDOMNode-test.js
index 6928f53ff2..c59d4de974 100644
--- a/src/renderers/dom/shared/__tests__/findDOMNode-test.js
+++ b/src/renderers/dom/shared/__tests__/findDOMNode-test.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var ReactTestUtils = require('ReactTestUtils');
describe('findDOMNode', () => {
diff --git a/src/renderers/dom/shared/__tests__/inputValueTracking-test.js b/src/renderers/dom/shared/__tests__/inputValueTracking-test.js
index 311caeefa3..36dfb35d9a 100644
--- a/src/renderers/dom/shared/__tests__/inputValueTracking-test.js
+++ b/src/renderers/dom/shared/__tests__/inputValueTracking-test.js
@@ -10,7 +10,7 @@
*/
'use strict';
-var React = require('React');
+var React = require('react');
var ReactTestUtils = require('ReactTestUtils');
var inputValueTracking = require('inputValueTracking');
diff --git a/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js b/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js
index e1163835fe..fd23f5ef4f 100644
--- a/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js
@@ -12,7 +12,7 @@
'use strict';
var EventPropagators = require('EventPropagators');
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var FallbackCompositionState = require('FallbackCompositionState');
var SyntheticCompositionEvent = require('SyntheticCompositionEvent');
var SyntheticInputEvent = require('SyntheticInputEvent');
diff --git a/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
index dc777a38ef..fcc39015b3 100644
--- a/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
@@ -13,7 +13,7 @@
var EventPluginHub = require('EventPluginHub');
var EventPropagators = require('EventPropagators');
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var ReactControlledComponent = require('ReactControlledComponent');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactGenericBatching = require('ReactGenericBatching');
diff --git a/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
index 831391dd44..92356beea9 100644
--- a/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
@@ -12,15 +12,15 @@
'use strict';
var EventPropagators = require('EventPropagators');
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactInputSelection = require('ReactInputSelection');
var SyntheticEvent = require('SyntheticEvent');
-var getActiveElement = require('getActiveElement');
+var getActiveElement = require('fbjs/lib/getActiveElement');
var isTextInputElement = require('isTextInputElement');
-var shallowEqual = require('shallowEqual');
+var shallowEqual = require('fbjs/lib/shallowEqual');
var skipSelectionChangeEvent = (
ExecutionEnvironment.canUseDOM &&
diff --git a/src/renderers/dom/shared/eventPlugins/SimpleEventPlugin.js b/src/renderers/dom/shared/eventPlugins/SimpleEventPlugin.js
index d55d137350..d77611648c 100644
--- a/src/renderers/dom/shared/eventPlugins/SimpleEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/SimpleEventPlugin.js
@@ -26,7 +26,7 @@ var SyntheticUIEvent = require('SyntheticUIEvent');
var SyntheticWheelEvent = require('SyntheticWheelEvent');
var getEventCharCode = require('getEventCharCode');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
import type {TopLevelTypes} from 'EventConstants';
import type {
diff --git a/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js b/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
index 2bf0c2fa3d..1d0a563bdf 100644
--- a/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
@@ -15,7 +15,7 @@
var EventPluginUtils = require('EventPluginUtils');
var EventPropagators = require('EventPropagators');
var SyntheticUIEvent = require('SyntheticUIEvent');
-var TouchEventUtils = require('TouchEventUtils');
+var TouchEventUtils = require('fbjs/lib/TouchEventUtils');
var ViewportMetrics = require('ViewportMetrics');
var isStartish = EventPluginUtils.isStartish;
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
index 423de23a27..fda773afce 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
@@ -11,7 +11,7 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactTestUtils = require('ReactTestUtils');
var EventMapping = {
@@ -47,7 +47,7 @@ describe('BeforeInputEventPlugin', function() {
// Modules which have dependency on BeforeInputEventPlugin are stored
// in ModuleCache so that we can use these modules ouside test functions.
- this.ReactDOM = require('ReactDOM');
+ this.ReactDOM = require('react-dom');
this.ReactDOMComponentTree = require('ReactDOMComponentTree');
this.SyntheticCompositionEvent = require('SyntheticCompositionEvent');
this.SyntheticInputEvent = require('SyntheticInputEvent');
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
index fc58c74e71..4c789e2d08 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var ReactTestUtils = require('ReactTestUtils');
var ChangeEventPlugin = require('ChangeEventPlugin');
var inputValueTracking = require('inputValueTracking');
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
index 2c4094deb4..499de33da4 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
@@ -21,8 +21,8 @@ describe('EnterLeaveEventPlugin', () => {
jest.resetModules();
EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMComponentTree = require('ReactDOMComponentTree');
});
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js
index 1f6464b6f4..c3754642cb 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js
@@ -28,8 +28,8 @@ describe('SelectEventPlugin', () => {
}
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMComponentTree = require('ReactDOMComponentTree');
ReactTestUtils = require('ReactTestUtils');
SelectEventPlugin = require('SelectEventPlugin');
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js
index 5f4a533ea4..9e7b0ab681 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/SimpleEventPlugin-test.js
@@ -35,8 +35,8 @@ describe('SimpleEventPlugin', function() {
}
beforeEach(function() {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
onClick = jest.fn();
diff --git a/src/renderers/dom/shared/findDOMNode.js b/src/renderers/dom/shared/findDOMNode.js
index 0986c7290e..7558d8d9f8 100644
--- a/src/renderers/dom/shared/findDOMNode.js
+++ b/src/renderers/dom/shared/findDOMNode.js
@@ -10,12 +10,12 @@
* @flow
*/
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactInstanceMap = require('ReactInstanceMap');
var getComponentName = require('getComponentName');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
let findFiber = function(arg) {
invariant(false, 'Missing injection for fiber findDOMNode');
diff --git a/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js b/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
index a470e9afec..8dc38050b1 100644
--- a/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
+++ b/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
@@ -12,10 +12,10 @@
'use strict';
var DOMProperty = require('DOMProperty');
-var ReactComponentTreeHook = require('ReactComponentTreeHook');
+var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var warnedProperties = {};
var rARIA = new RegExp('^(aria)-[' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$');
diff --git a/src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js b/src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js
index 564f6e1abd..24b6b64f7f 100644
--- a/src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js
+++ b/src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js
@@ -11,10 +11,10 @@
'use strict';
-var ReactComponentTreeHook = require('ReactComponentTreeHook');
+var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var didWarnValueNull = false;
diff --git a/src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js b/src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js
index 6462875f65..6803bd317a 100644
--- a/src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js
+++ b/src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js
@@ -13,10 +13,10 @@
var DOMProperty = require('DOMProperty');
var EventPluginRegistry = require('EventPluginRegistry');
-var ReactComponentTreeHook = require('ReactComponentTreeHook');
+var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
function getStackAddendum(debugID) {
if (debugID != null) {
diff --git a/src/renderers/dom/shared/setInnerHTML.js b/src/renderers/dom/shared/setInnerHTML.js
index 616d37fc32..5b5f2ec90e 100644
--- a/src/renderers/dom/shared/setInnerHTML.js
+++ b/src/renderers/dom/shared/setInnerHTML.js
@@ -11,7 +11,7 @@
'use strict';
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var DOMNamespaces = require('DOMNamespaces');
var WHITESPACE_TEST = /^[ \r\n\t\f]/;
diff --git a/src/renderers/dom/shared/setTextContent.js b/src/renderers/dom/shared/setTextContent.js
index 8432846185..5e035342b0 100644
--- a/src/renderers/dom/shared/setTextContent.js
+++ b/src/renderers/dom/shared/setTextContent.js
@@ -11,7 +11,7 @@
'use strict';
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
var setInnerHTML = require('setInnerHTML');
@@ -28,7 +28,7 @@ var setInnerHTML = require('setInnerHTML');
var setTextContent = function(node, text) {
if (text) {
var firstChild = node.firstChild;
-
+
if (firstChild && firstChild === node.lastChild && firstChild.nodeType === 3) {
firstChild.nodeValue = text;
return;
diff --git a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js
index b1ca2d61e1..0bba4dd146 100644
--- a/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js
+++ b/src/renderers/dom/shared/syntheticEvents/__tests__/SyntheticEvent-test.js
@@ -21,8 +21,8 @@ describe('SyntheticEvent', () => {
beforeEach(() => {
SyntheticEvent = require('SyntheticEvent');
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
createEvent = function(nativeEvent) {
diff --git a/src/renderers/dom/shared/utils/AutoFocusUtils.js b/src/renderers/dom/shared/utils/AutoFocusUtils.js
index 595bddd6de..43a99bc3ea 100644
--- a/src/renderers/dom/shared/utils/AutoFocusUtils.js
+++ b/src/renderers/dom/shared/utils/AutoFocusUtils.js
@@ -13,7 +13,7 @@
var ReactDOMComponentTree = require('ReactDOMComponentTree');
-var focusNode = require('focusNode');
+var focusNode = require('fbjs/lib/focusNode');
var AutoFocusUtils = {
focusDOMComponent: function() {
diff --git a/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js b/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
index fb77ebd7c0..1b76fc28b3 100644
--- a/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
+++ b/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
@@ -11,10 +11,10 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactPropTypesSecret = require('ReactPropTypesSecret');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var hasReadOnlyValue = {
'button': true,
diff --git a/src/renderers/dom/shared/utils/getTextContentAccessor.js b/src/renderers/dom/shared/utils/getTextContentAccessor.js
index 198e6bbb6a..6000d4beab 100644
--- a/src/renderers/dom/shared/utils/getTextContentAccessor.js
+++ b/src/renderers/dom/shared/utils/getTextContentAccessor.js
@@ -11,7 +11,7 @@
'use strict';
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var contentKey = null;
diff --git a/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js b/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js
index 25fa2aed8a..c1576315c6 100644
--- a/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js
+++ b/src/renderers/dom/shared/utils/getVendorPrefixedEventName.js
@@ -11,7 +11,7 @@
'use strict';
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
/**
* Generate a mapping of standard vendor prefixes using the defined style property and event name.
diff --git a/src/renderers/dom/shared/utils/isEventSupported.js b/src/renderers/dom/shared/utils/isEventSupported.js
index f738576411..a3fc30495a 100644
--- a/src/renderers/dom/shared/utils/isEventSupported.js
+++ b/src/renderers/dom/shared/utils/isEventSupported.js
@@ -11,7 +11,7 @@
'use strict';
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
var useHasFeature;
if (ExecutionEnvironment.canUseDOM) {
diff --git a/src/renderers/dom/shared/validateDOMNesting.js b/src/renderers/dom/shared/validateDOMNesting.js
index 8fa3216f70..737ae7ca9f 100644
--- a/src/renderers/dom/shared/validateDOMNesting.js
+++ b/src/renderers/dom/shared/validateDOMNesting.js
@@ -11,9 +11,9 @@
'use strict';
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
var getComponentName = require('getComponentName');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var validateDOMNesting = emptyFunction;
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js
index b8e7343975..91bb091994 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js
@@ -17,8 +17,8 @@ describe('ReactDOMIframe', () => {
var ReactTestUtils;
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index 8c9002e2a1..366f6803b8 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -12,7 +12,7 @@
'use strict';
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
describe('ReactDOMInput', () => {
var React;
@@ -31,9 +31,9 @@ describe('ReactDOMInput', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
ReactTestUtils = require('ReactTestUtils');
inputValueTracking = require('inputValueTracking');
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
index 8c5e74c74e..59ba79eac0 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
@@ -23,8 +23,8 @@ describe('ReactDOMOption', () => {
var ReactTestUtils;
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
+ React = require('react');
+ ReactDOM = require('react-dom');
ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
index a8a0c0b712..37bda509e1 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
@@ -21,9 +21,9 @@ describe('ReactDOMSelect', () => {
var noop = function() {};
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
index 997a9b949f..dbae062a5e 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
@@ -11,7 +11,7 @@
'use strict';
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
describe('ReactDOMTextarea', () => {
var React;
@@ -22,9 +22,9 @@ describe('ReactDOMTextarea', () => {
var renderTextarea;
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
ReactTestUtils = require('ReactTestUtils');
renderTextarea = function(component, container) {
diff --git a/src/renderers/dom/stack/client/Danger.js b/src/renderers/dom/stack/client/Danger.js
index 94f7ae4c57..ddd0f407b7 100644
--- a/src/renderers/dom/stack/client/Danger.js
+++ b/src/renderers/dom/stack/client/Danger.js
@@ -12,11 +12,11 @@
'use strict';
var DOMLazyTree = require('DOMLazyTree');
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
-var createNodesFromMarkup = require('createNodesFromMarkup');
-var emptyFunction = require('emptyFunction');
-var invariant = require('invariant');
+var createNodesFromMarkup = require('fbjs/lib/createNodesFromMarkup');
+var emptyFunction = require('fbjs/lib/emptyFunction');
+var invariant = require('fbjs/lib/invariant');
var Danger = {
diff --git a/src/renderers/dom/stack/client/ReactDOMComponent.js b/src/renderers/dom/stack/client/ReactDOMComponent.js
index 9fd3a45f92..bd21c6f866 100644
--- a/src/renderers/dom/stack/client/ReactDOMComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMComponent.js
@@ -31,13 +31,13 @@ var ReactInstrumentation = require('ReactInstrumentation');
var ReactMultiChild = require('ReactMultiChild');
var ReactServerRenderingTransaction = require('ReactServerRenderingTransaction');
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var isEventSupported = require('isEventSupported');
var inputValueTracking = require('inputValueTracking');
var validateDOMNesting = require('validateDOMNesting');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var didWarnShadyDOM = false;
var Flags = ReactDOMComponentFlags;
diff --git a/src/renderers/dom/stack/client/ReactDOMTextComponent.js b/src/renderers/dom/stack/client/ReactDOMTextComponent.js
index 860bc33496..1046b33e66 100644
--- a/src/renderers/dom/stack/client/ReactDOMTextComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMTextComponent.js
@@ -16,7 +16,7 @@ var DOMLazyTree = require('DOMLazyTree');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var validateDOMNesting = require('validateDOMNesting');
/**
diff --git a/src/renderers/dom/stack/client/ReactMount.js b/src/renderers/dom/stack/client/ReactMount.js
index a1554d81bd..77ee158c77 100644
--- a/src/renderers/dom/stack/client/ReactMount.js
+++ b/src/renderers/dom/stack/client/ReactMount.js
@@ -13,9 +13,9 @@
var DOMLazyTree = require('DOMLazyTree');
var DOMProperty = require('DOMProperty');
-var React = require('React');
+var React = require('react');
var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactDOMContainerInfo = require('ReactDOMContainerInfo');
var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
@@ -29,10 +29,10 @@ var ReactUpdates = require('ReactUpdates');
var getContextForSubtree = require('getContextForSubtree');
var instantiateReactComponent = require('instantiateReactComponent');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var setInnerHTML = require('setInnerHTML');
var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var validateCallback = require('validateCallback');
var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
index 77026c0d55..b3118e949d 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
@@ -15,8 +15,8 @@ var DOMPropertyOperations = require('DOMPropertyOperations');
var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
var didWarnValueDefaultValue = false;
var didWarnCheckedDefaultChecked = false;
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js b/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js
index 2a2a28a180..aeb08ef807 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMOption.js
@@ -11,11 +11,11 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactDOMSelect = require('ReactDOMSelect');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var didWarnInvalidOptionChildren = false;
function flattenChildren(children) {
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
index 6191b4999b..a2674f6627 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
@@ -14,7 +14,7 @@
var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var didWarnValueDefaultValue = false;
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
index cdba791860..f8110dd56b 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
@@ -14,8 +14,8 @@
var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
var didWarnValDefaultVal = false;
diff --git a/src/renderers/dom/stack/server/ReactServerRendering.js b/src/renderers/dom/stack/server/ReactServerRendering.js
index bd253cee55..9ecb3bf0f5 100644
--- a/src/renderers/dom/stack/server/ReactServerRendering.js
+++ b/src/renderers/dom/stack/server/ReactServerRendering.js
@@ -10,7 +10,7 @@
*/
'use strict';
-var React = require('React');
+var React = require('react');
var ReactDOMContainerInfo = require('ReactDOMContainerInfo');
var ReactInstrumentation = require('ReactInstrumentation');
var ReactMarkupChecksum = require('ReactMarkupChecksum');
@@ -20,9 +20,9 @@ var ReactServerRenderingTransaction =
require('ReactServerRenderingTransaction');
var ReactUpdates = require('ReactUpdates');
-var emptyObject = require('emptyObject');
+var emptyObject = require('fbjs/lib/emptyObject');
var instantiateReactComponent = require('instantiateReactComponent');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var pendingTransactions = 0;
diff --git a/src/renderers/dom/stack/server/ReactServerUpdateQueue.js b/src/renderers/dom/stack/server/ReactServerUpdateQueue.js
index 0129c0d79a..34fe4e8405 100644
--- a/src/renderers/dom/stack/server/ReactServerUpdateQueue.js
+++ b/src/renderers/dom/stack/server/ReactServerUpdateQueue.js
@@ -14,7 +14,7 @@
var ReactUpdateQueue = require('ReactUpdateQueue');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
import type { Transaction } from 'Transaction';
diff --git a/src/renderers/native/NativeMethodsMixin.js b/src/renderers/native/NativeMethodsMixin.js
index 810ec3167f..aa7af7f066 100644
--- a/src/renderers/native/NativeMethodsMixin.js
+++ b/src/renderers/native/NativeMethodsMixin.js
@@ -16,7 +16,7 @@ var ReactNativeAttributePayload = require('ReactNativeAttributePayload');
var TextInputState = require('TextInputState');
var UIManager = require('UIManager');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
type MeasureOnSuccessCallback = (
x: number,
diff --git a/src/renderers/native/ReactNativeBridgeEventPlugin.js b/src/renderers/native/ReactNativeBridgeEventPlugin.js
index 1e5f4ee7af..e0be0f1cbc 100644
--- a/src/renderers/native/ReactNativeBridgeEventPlugin.js
+++ b/src/renderers/native/ReactNativeBridgeEventPlugin.js
@@ -15,7 +15,7 @@ var EventPropagators = require('EventPropagators');
var SyntheticEvent = require('SyntheticEvent');
var UIManager = require('UIManager');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var customBubblingEventTypes = UIManager.customBubblingEventTypes;
var customDirectEventTypes = UIManager.customDirectEventTypes;
diff --git a/src/renderers/native/ReactNativeComponentTree.js b/src/renderers/native/ReactNativeComponentTree.js
index 8a157d7c2b..e091667789 100644
--- a/src/renderers/native/ReactNativeComponentTree.js
+++ b/src/renderers/native/ReactNativeComponentTree.js
@@ -11,7 +11,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var instanceCache = {};
var instanceProps = {};
diff --git a/src/renderers/native/ReactNativeEventEmitter.js b/src/renderers/native/ReactNativeEventEmitter.js
index 72ff28d6ab..1e1c97e308 100644
--- a/src/renderers/native/ReactNativeEventEmitter.js
+++ b/src/renderers/native/ReactNativeEventEmitter.js
@@ -18,7 +18,7 @@ var ReactNativeComponentTree = require('ReactNativeComponentTree');
var ReactNativeTagHandles = require('ReactNativeTagHandles');
var ReactGenericBatching = require('ReactGenericBatching');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
/**
* Version of `ReactBrowserEventEmitter` that works on the receiving side of a
diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index de7b46af4d..1d73e80b88 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -29,9 +29,9 @@ const ReactPortal = require('ReactPortal');
const UIManager = require('UIManager');
const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');
-const emptyObject = require('emptyObject');
+const emptyObject = require('fbjs/lib/emptyObject');
const findNodeHandle = require('findNodeHandle');
-const invariant = require('invariant');
+const invariant = require('fbjs/lib/invariant');
const { injectInternals } = require('ReactFiberDevToolsHook');
const {
diff --git a/src/renderers/native/ReactNativeMount.js b/src/renderers/native/ReactNativeMount.js
index aa803a74bb..f5974d813f 100644
--- a/src/renderers/native/ReactNativeMount.js
+++ b/src/renderers/native/ReactNativeMount.js
@@ -11,7 +11,7 @@
*/
'use strict';
-var React = require('React');
+var React = require('react');
var ReactInstrumentation = require('ReactInstrumentation');
var ReactNativeContainerInfo = require('ReactNativeContainerInfo');
var ReactNativeTagHandles = require('ReactNativeTagHandles');
@@ -20,7 +20,7 @@ var ReactUpdateQueue = require('ReactUpdateQueue');
var ReactUpdates = require('ReactUpdates');
var UIManager = require('UIManager');
-var emptyObject = require('emptyObject');
+var emptyObject = require('fbjs/lib/emptyObject');
var instantiateReactComponent = require('instantiateReactComponent');
var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
diff --git a/src/renderers/native/ReactNativeStackInjection.js b/src/renderers/native/ReactNativeStackInjection.js
index 90b912c020..63ca4e124b 100644
--- a/src/renderers/native/ReactNativeStackInjection.js
+++ b/src/renderers/native/ReactNativeStackInjection.js
@@ -19,7 +19,7 @@
*/
require('InitializeCore');
-var React = require('React');
+var React = require('react');
var ReactComponentEnvironment = require('ReactComponentEnvironment');
var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
var ReactEmptyComponent = require('ReactEmptyComponent');
@@ -31,7 +31,7 @@ var ReactSimpleEmptyComponent = require('ReactSimpleEmptyComponent');
var ReactUpdates = require('ReactUpdates');
var findNodeHandle = require('findNodeHandle');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
function inject() {
ReactGenericBatching.injection.injectStackBatchedUpdates(
diff --git a/src/renderers/native/ReactNativeTagHandles.js b/src/renderers/native/ReactNativeTagHandles.js
index d0c7bb2685..17e7e5d8e6 100644
--- a/src/renderers/native/ReactNativeTagHandles.js
+++ b/src/renderers/native/ReactNativeTagHandles.js
@@ -11,7 +11,7 @@
*/
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
/**
* Keeps track of allocating and associating native "tags" which are numeric,
diff --git a/src/renderers/native/ReactNativeTextComponent.js b/src/renderers/native/ReactNativeTextComponent.js
index 8e815f9efb..eb8525a49e 100644
--- a/src/renderers/native/ReactNativeTextComponent.js
+++ b/src/renderers/native/ReactNativeTextComponent.js
@@ -15,7 +15,7 @@ var ReactNativeComponentTree = require('ReactNativeComponentTree');
var ReactNativeTagHandles = require('ReactNativeTagHandles');
var UIManager = require('UIManager');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var ReactNativeTextComponent = function(text) {
// This is really a ReactText (ReactNode), not a ReactElement
diff --git a/src/renderers/native/ReactNativeViewConfigRegistry.js b/src/renderers/native/ReactNativeViewConfigRegistry.js
index 383ee8bba2..39f95046e6 100644
--- a/src/renderers/native/ReactNativeViewConfigRegistry.js
+++ b/src/renderers/native/ReactNativeViewConfigRegistry.js
@@ -12,7 +12,7 @@
'use strict';
-const invariant = require('invariant');
+const invariant = require('fbjs/lib/invariant');
export type ReactNativeBaseComponentViewConfig = {
validAttributes: Object,
diff --git a/src/renderers/native/__tests__/ReactNativeEvents-test.js b/src/renderers/native/__tests__/ReactNativeEvents-test.js
index 7aa3720cc3..b9ae12aa04 100644
--- a/src/renderers/native/__tests__/ReactNativeEvents-test.js
+++ b/src/renderers/native/__tests__/ReactNativeEvents-test.js
@@ -22,7 +22,7 @@ beforeEach(() => {
jest.resetModules();
RCTEventEmitter = require('RCTEventEmitter');
- React = require('React');
+ React = require('react');
ReactNative = require('ReactNative');
ResponderEventPlugin = require('ResponderEventPlugin');
UIManager = require('UIManager');
diff --git a/src/renderers/native/__tests__/ReactNativeMount-test.js b/src/renderers/native/__tests__/ReactNativeMount-test.js
index c5e3ebecab..c4fb4b77d0 100644
--- a/src/renderers/native/__tests__/ReactNativeMount-test.js
+++ b/src/renderers/native/__tests__/ReactNativeMount-test.js
@@ -20,7 +20,7 @@ describe('ReactNative', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNative = require('ReactNative');
UIManager = require('UIManager');
createReactNativeComponentClass = require('createReactNativeComponentClass');
diff --git a/src/renderers/native/findNodeHandle.js b/src/renderers/native/findNodeHandle.js
index 345700f1c0..7edb378924 100644
--- a/src/renderers/native/findNodeHandle.js
+++ b/src/renderers/native/findNodeHandle.js
@@ -12,11 +12,11 @@
'use strict';
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactInstanceMap = require('ReactInstanceMap');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
import type { ReactInstance } from 'ReactInstanceType';
diff --git a/src/renderers/noop/ReactNoop.js b/src/renderers/noop/ReactNoop.js
index 320dd2be41..efb616651e 100644
--- a/src/renderers/noop/ReactNoop.js
+++ b/src/renderers/noop/ReactNoop.js
@@ -27,7 +27,7 @@ var ReactInstanceMap = require('ReactInstanceMap');
var {
AnimationPriority,
} = require('ReactPriorityLevel');
-var emptyObject = require('emptyObject');
+var emptyObject = require('fbjs/lib/emptyObject');
const UPDATE_SIGNAL = {};
diff --git a/src/renderers/shared/ReactDebugTool.js b/src/renderers/shared/ReactDebugTool.js
index fa2f68bdde..6a3781f947 100644
--- a/src/renderers/shared/ReactDebugTool.js
+++ b/src/renderers/shared/ReactDebugTool.js
@@ -14,11 +14,11 @@
var ReactInvalidSetStateWarningHook = require('ReactInvalidSetStateWarningHook');
var ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook');
-var ReactComponentTreeHook = require('ReactComponentTreeHook');
-var ExecutionEnvironment = require('ExecutionEnvironment');
+var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
-var performanceNow = require('performanceNow');
-var warning = require('warning');
+var performanceNow = require('fbjs/lib/performanceNow');
+var warning = require('fbjs/lib/warning');
import type { ReactElement } from 'ReactElementType';
import type { DebugID } from 'ReactInstanceType';
diff --git a/src/renderers/shared/ReactPerf.js b/src/renderers/shared/ReactPerf.js
index 0f3886f69f..17620aee1c 100644
--- a/src/renderers/shared/ReactPerf.js
+++ b/src/renderers/shared/ReactPerf.js
@@ -13,7 +13,7 @@
'use strict';
var ReactDebugTool = require('ReactDebugTool');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var alreadyWarned = false;
import type { FlushHistory } from 'ReactDebugTool';
diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index 79f80c9e40..8fd3d22a1b 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -32,16 +32,16 @@ var ReactFiber = require('ReactFiber');
var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect');
var ReactTypeOfWork = require('ReactTypeOfWork');
-var emptyObject = require('emptyObject');
+var emptyObject = require('fbjs/lib/emptyObject');
var getIteratorFn = require('getIteratorFn');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var ReactFeatureFlags = require('ReactFeatureFlags');
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
if (__DEV__) {
var { getCurrentFiberStackAddendum } = require('ReactDebugCurrentFiber');
var { getComponentName } = require('ReactFiberTreeReflection');
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
var didWarnAboutMaps = false;
}
diff --git a/src/renderers/shared/fiber/ReactDebugCurrentFiber.js b/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
index 6969cec658..33ad128f72 100644
--- a/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
+++ b/src/renderers/shared/fiber/ReactDebugCurrentFiber.js
@@ -18,7 +18,7 @@ type LifeCyclePhase = 'render' | 'getChildContext';
if (__DEV__) {
var getComponentName = require('getComponentName');
- var { getStackAddendumByWorkInProgressFiber } = require('ReactComponentTreeHook');
+ var { getStackAddendumByWorkInProgressFiber } = require('react/lib/ReactComponentTreeHook');
}
function getCurrentFiberOwnerName() : string | null {
diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
index 6432ec33b4..bd89a93f82 100644
--- a/src/renderers/shared/fiber/ReactFiber.js
+++ b/src/renderers/shared/fiber/ReactFiber.js
@@ -47,7 +47,7 @@ var {
cloneUpdateQueue,
} = require('ReactFiberUpdateQueue');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
if (__DEV__) {
var getComponentName = require('getComponentName');
diff --git a/src/renderers/shared/fiber/ReactFiberBeginWork.js b/src/renderers/shared/fiber/ReactFiberBeginWork.js
index b88be76bf0..636b583708 100644
--- a/src/renderers/shared/fiber/ReactFiberBeginWork.js
+++ b/src/renderers/shared/fiber/ReactFiberBeginWork.js
@@ -60,13 +60,13 @@ var {
Err,
Ref,
} = require('ReactTypeOfSideEffect');
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactFiberClassComponent = require('ReactFiberClassComponent');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
if (__DEV__) {
var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
var warnedAboutStatelessRefs = {};
}
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index 2856279537..bdb377b54b 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -33,14 +33,14 @@ var {
var { hasContextChanged } = require('ReactFiberContext');
var { getComponentName, isMounted } = require('ReactFiberTreeReflection');
var ReactInstanceMap = require('ReactInstanceMap');
-var emptyObject = require('emptyObject');
-var shallowEqual = require('shallowEqual');
-var invariant = require('invariant');
+var emptyObject = require('fbjs/lib/emptyObject');
+var shallowEqual = require('fbjs/lib/shallowEqual');
+var invariant = require('fbjs/lib/invariant');
const isArray = Array.isArray;
if (__DEV__) {
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
var warnOnInvalidCallback = function(callback : mixed, callerName : string) {
warning(
callback === null || typeof callback === 'function',
diff --git a/src/renderers/shared/fiber/ReactFiberCommitWork.js b/src/renderers/shared/fiber/ReactFiberCommitWork.js
index b9bc6d6fb4..e9676b106a 100644
--- a/src/renderers/shared/fiber/ReactFiberCommitWork.js
+++ b/src/renderers/shared/fiber/ReactFiberCommitWork.js
@@ -35,7 +35,7 @@ var {
ContentReset,
} = require('ReactTypeOfSideEffect');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
module.exports = function(
config : HostConfig,
diff --git a/src/renderers/shared/fiber/ReactFiberCompleteWork.js b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
index c8a8888d60..8a04936183 100644
--- a/src/renderers/shared/fiber/ReactFiberCompleteWork.js
+++ b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
@@ -46,7 +46,7 @@ if (__DEV__) {
var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
}
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
module.exports = function(
config : HostConfig,
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
index dbb7a43bd9..d921285a6b 100644
--- a/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -15,9 +15,9 @@
import type { Fiber } from 'ReactFiber';
import type { StackCursor } from 'ReactFiberStack';
-var emptyObject = require('emptyObject');
-var invariant = require('invariant');
-var warning = require('warning');
+var emptyObject = require('fbjs/lib/emptyObject');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
var {
getComponentName,
isFiberMounted,
@@ -34,7 +34,7 @@ const {
if (__DEV__) {
var checkReactTypeSpec = require('checkReactTypeSpec');
- var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
+ var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');
var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
var warnedAboutMissingGetChildContext = {};
}
diff --git a/src/renderers/shared/fiber/ReactFiberDevToolsHook.js b/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
index 0a0b8fb2fb..6fc5666845 100644
--- a/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
+++ b/src/renderers/shared/fiber/ReactFiberDevToolsHook.js
@@ -12,7 +12,7 @@
'use strict';
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
import type { Fiber } from 'ReactFiber';
import type { FiberRoot } from 'ReactFiberRoot';
diff --git a/src/renderers/shared/fiber/ReactFiberHostContext.js b/src/renderers/shared/fiber/ReactFiberHostContext.js
index 86c130c7cd..8962a482ac 100644
--- a/src/renderers/shared/fiber/ReactFiberHostContext.js
+++ b/src/renderers/shared/fiber/ReactFiberHostContext.js
@@ -16,7 +16,7 @@ import type { Fiber } from 'ReactFiber';
import type { HostConfig } from 'ReactFiberReconciler';
import type { StackCursor } from 'ReactFiberStack';
-const emptyObject = require('emptyObject');
+const emptyObject = require('fbjs/lib/emptyObject');
const {
createCursor,
@@ -24,7 +24,7 @@ const {
push,
} = require('ReactFiberStack');
-const invariant = require('invariant');
+const invariant = require('fbjs/lib/invariant');
export type HostContext = {
getHostContext() : CX,
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 3f910aa1d9..62cacd97f7 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -30,7 +30,7 @@ var { createFiberRoot } = require('ReactFiberRoot');
var ReactFiberScheduler = require('ReactFiberScheduler');
if (__DEV__) {
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
var ReactFiberInstrumentation = require('ReactFiberInstrumentation');
var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
var { getComponentName } = require('ReactFiberTreeReflection');
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 8ab6ee177f..3b63370bfb 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -37,7 +37,7 @@ var {
const { reset } = require('ReactFiberStack');
var {
getStackAddendumByWorkInProgressFiber,
-} = require('ReactComponentTreeHook');
+} = require('react/lib/ReactComponentTreeHook');
var { logCapturedError } = require('ReactFiberErrorLogger');
var { invokeGuardedCallback } = require('ReactErrorUtils');
@@ -45,7 +45,7 @@ var ReactFiberBeginWork = require('ReactFiberBeginWork');
var ReactFiberCompleteWork = require('ReactFiberCompleteWork');
var ReactFiberCommitWork = require('ReactFiberCommitWork');
var ReactFiberHostContext = require('ReactFiberHostContext');
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactFeatureFlags = require('ReactFeatureFlags');
var getComponentName = require('getComponentName');
@@ -89,10 +89,10 @@ var {
resetContext,
} = require('ReactFiberContext');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
if (__DEV__) {
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
var ReactFiberInstrumentation = require('ReactFiberInstrumentation');
var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
diff --git a/src/renderers/shared/fiber/ReactFiberStack.js b/src/renderers/shared/fiber/ReactFiberStack.js
index 3d51b4aec6..9ba1734274 100644
--- a/src/renderers/shared/fiber/ReactFiberStack.js
+++ b/src/renderers/shared/fiber/ReactFiberStack.js
@@ -18,7 +18,7 @@ export type StackCursor = {
current: T
};
-const warning = require('warning');
+const warning = require('fbjs/lib/warning');
const valueStack : Array = [];
diff --git a/src/renderers/shared/fiber/ReactFiberTreeReflection.js b/src/renderers/shared/fiber/ReactFiberTreeReflection.js
index 63f4a68183..491156dbf7 100644
--- a/src/renderers/shared/fiber/ReactFiberTreeReflection.js
+++ b/src/renderers/shared/fiber/ReactFiberTreeReflection.js
@@ -15,12 +15,12 @@
import type { Fiber } from 'ReactFiber';
var ReactInstanceMap = require('ReactInstanceMap');
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
if (__DEV__) {
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
}
var {
diff --git a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
index f07fec3f46..45813e9558 100644
--- a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
+++ b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
@@ -25,9 +25,9 @@ const {
TaskPriority,
} = require('ReactPriorityLevel');
-const invariant = require('invariant');
+const invariant = require('fbjs/lib/invariant');
if (__DEV__) {
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
}
type PartialState =
diff --git a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
index 9de98abb1c..f75e4cdd86 100644
--- a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
@@ -19,7 +19,7 @@ var ReactFeatureFlags;
describe('ReactCoroutine', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactCoroutine = require('ReactCoroutine');
ReactFeatureFlags = require('ReactFeatureFlags');
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
index 96407cf289..7b3997e74a 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
describe('ReactIncremental', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactFeatureFlags = require('ReactFeatureFlags');
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
index 7dcf12dfd7..0af4dc2f10 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
describe('ReactIncrementalErrorHandling', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactFeatureFlags = require('ReactFeatureFlags');
ReactFeatureFlags.disableNewFiberFeatures = false;
@@ -948,7 +948,7 @@ describe('ReactIncrementalErrorHandling', () => {
} else {
jest.unmock('ReactFiberErrorLogger');
}
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
}
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
index 80ff14643d..187ff7095e 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
describe('ReactIncrementalReflection', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactFeatureFlags = require('ReactFeatureFlags');
ReactFeatureFlags.disableNewFiberFeatures = false;
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
index c856f26380..cbc037579d 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
describe('ReactIncrementalScheduling', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactFeatureFlags = require('ReactFeatureFlags');
ReactFeatureFlags.disableNewFiberFeatures = false;
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
index 6b7b9785df..04e3daeebb 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
describe('ReactIncrementalSideEffects', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactFeatureFlags = require('ReactFeatureFlags');
ReactFeatureFlags.disableNewFiberFeatures = false;
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
index 9953c8db81..55a241636b 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
@@ -18,7 +18,7 @@ var ReactFeatureFlags;
describe('ReactIncrementalUpdates', () => {
beforeEach(() => {
jest.resetModuleRegistry();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactFeatureFlags = require('ReactFeatureFlags');
ReactFeatureFlags.disableNewFiberFeatures = false;
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
index 04004e46a2..703a6310fd 100644
--- a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
@@ -20,7 +20,7 @@ var ReactFeatureFlags;
describe('ReactTopLevelFragment', function() {
beforeEach(function() {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactFeatureFlags = require('ReactFeatureFlags');
ReactFeatureFlags.disableNewFiberFeatures = false;
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
index 84a98da730..45fb416251 100644
--- a/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelText-test.js
@@ -20,7 +20,7 @@ var ReactFeatureFlags;
describe('ReactTopLevelText', () => {
beforeEach(() => {
jest.resetModules();
- React = require('React');
+ React = require('react');
ReactNoop = require('ReactNoop');
ReactFeatureFlags = require('ReactFeatureFlags');
ReactFeatureFlags.disableNewFiberFeatures = false;
diff --git a/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js b/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
index 21187b023b..b121f765ff 100644
--- a/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
+++ b/src/renderers/shared/hooks/ReactInvalidSetStateWarningHook.js
@@ -12,7 +12,7 @@
'use strict';
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var ReactInvalidSetStateWarningHook = {};
diff --git a/src/renderers/shared/shared/event/EventPluginHub.js b/src/renderers/shared/shared/event/EventPluginHub.js
index 3efb214661..6c4235ea42 100644
--- a/src/renderers/shared/shared/event/EventPluginHub.js
+++ b/src/renderers/shared/shared/event/EventPluginHub.js
@@ -17,7 +17,7 @@ var ReactErrorUtils = require('ReactErrorUtils');
var accumulateInto = require('accumulateInto');
var forEachAccumulated = require('forEachAccumulated');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
/**
* Internal queue of events that have accumulated their dispatches and are
diff --git a/src/renderers/shared/shared/event/EventPluginRegistry.js b/src/renderers/shared/shared/event/EventPluginRegistry.js
index 1f09f23f83..fa868dca10 100644
--- a/src/renderers/shared/shared/event/EventPluginRegistry.js
+++ b/src/renderers/shared/shared/event/EventPluginRegistry.js
@@ -27,7 +27,7 @@ type NamesToPlugins = {[key: PluginName]: PluginModule};
type EventPluginOrder = null | Array;
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
/**
* Injectable ordering of event plugins.
diff --git a/src/renderers/shared/shared/event/EventPluginUtils.js b/src/renderers/shared/shared/event/EventPluginUtils.js
index 0a65060862..8714541941 100644
--- a/src/renderers/shared/shared/event/EventPluginUtils.js
+++ b/src/renderers/shared/shared/event/EventPluginUtils.js
@@ -13,8 +13,8 @@
var ReactErrorUtils = require('ReactErrorUtils');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
/**
* Injected dependencies:
diff --git a/src/renderers/shared/shared/event/EventPropagators.js b/src/renderers/shared/shared/event/EventPropagators.js
index 5be0235641..159d2e6c19 100644
--- a/src/renderers/shared/shared/event/EventPropagators.js
+++ b/src/renderers/shared/shared/event/EventPropagators.js
@@ -16,7 +16,7 @@ var ReactTreeTraversal = require('ReactTreeTraversal');
var accumulateInto = require('accumulateInto');
var forEachAccumulated = require('forEachAccumulated');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
import type { PropagationPhases } from 'EventConstants';
diff --git a/src/renderers/shared/shared/event/ReactControlledComponent.js b/src/renderers/shared/shared/event/ReactControlledComponent.js
index a5a84024ae..b2e0f5b8b2 100644
--- a/src/renderers/shared/shared/event/ReactControlledComponent.js
+++ b/src/renderers/shared/shared/event/ReactControlledComponent.js
@@ -13,7 +13,7 @@
var EventPluginUtils = require('EventPluginUtils');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
// Use to restore controlled state after a change event has fired.
diff --git a/src/renderers/shared/shared/event/SyntheticEvent.js b/src/renderers/shared/shared/event/SyntheticEvent.js
index 6c7d4fe16b..6972c67233 100644
--- a/src/renderers/shared/shared/event/SyntheticEvent.js
+++ b/src/renderers/shared/shared/event/SyntheticEvent.js
@@ -13,8 +13,8 @@
var PooledClass = require('PooledClass');
-var emptyFunction = require('emptyFunction');
-var warning = require('warning');
+var emptyFunction = require('fbjs/lib/emptyFunction');
+var warning = require('fbjs/lib/warning');
var didWarnForAddedNewProperty = false;
var isProxySupported = typeof Proxy === 'function';
diff --git a/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js b/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
index 94012a6552..78b7b31a80 100644
--- a/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
+++ b/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
@@ -14,8 +14,8 @@
const EventPluginUtils = require('EventPluginUtils');
-const invariant = require('invariant');
-const warning = require('warning');
+const invariant = require('fbjs/lib/invariant');
+const warning = require('fbjs/lib/warning');
const {
isEndish,
diff --git a/src/renderers/shared/shared/getContextForSubtree.js b/src/renderers/shared/shared/getContextForSubtree.js
index 7e9494ce2e..84f7e6a811 100644
--- a/src/renderers/shared/shared/getContextForSubtree.js
+++ b/src/renderers/shared/shared/getContextForSubtree.js
@@ -12,8 +12,8 @@
const ReactInstanceMap = require('ReactInstanceMap');
-const emptyObject = require('emptyObject');
-const invariant = require('invariant');
+const emptyObject = require('fbjs/lib/emptyObject');
+const invariant = require('fbjs/lib/invariant');
let getContextFiber = function(arg) {
invariant(false, 'Missing injection for fiber getContextForSubtree');
diff --git a/src/renderers/shared/stack/reconciler/CallbackQueue.js b/src/renderers/shared/stack/reconciler/CallbackQueue.js
index a6cd976129..5816938448 100644
--- a/src/renderers/shared/stack/reconciler/CallbackQueue.js
+++ b/src/renderers/shared/stack/reconciler/CallbackQueue.js
@@ -14,7 +14,7 @@
var PooledClass = require('PooledClass');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var validateCallback = require('validateCallback');
/**
diff --git a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
index f1ad0189bf..d858ed07ee 100644
--- a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
+++ b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
@@ -18,7 +18,7 @@ var ReactReconciler = require('ReactReconciler');
var instantiateReactComponent = require('instantiateReactComponent');
var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
var traverseAllChildren = require('traverseAllChildren');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var ReactComponentTreeHook;
@@ -32,7 +32,7 @@ if (
// https://github.com/facebook/react/issues/7240
// Remove the inline requires when we don't need them anymore:
// https://github.com/facebook/react/pull/7178
- ReactComponentTreeHook = require('ReactComponentTreeHook');
+ ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
}
function instantiateChild(childInstances, child, name, selfDebugID) {
@@ -40,7 +40,7 @@ function instantiateChild(childInstances, child, name, selfDebugID) {
var keyUnique = (childInstances[name] === undefined);
if (__DEV__) {
if (!ReactComponentTreeHook) {
- ReactComponentTreeHook = require('ReactComponentTreeHook');
+ ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
}
if (!keyUnique) {
warning(
diff --git a/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js b/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
index bb9835d5bc..e35cb498c7 100644
--- a/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
+++ b/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
@@ -12,7 +12,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
type ReplaceNodeWithMarkup = (node: HTMLElement, markup: string) => void;
type ProcessChildrenUpdates = (instance: mixed, updates: mixed) => void;
diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index a1434d7b88..851a5c97b2 100644
--- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -11,10 +11,10 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactComponentEnvironment = require('ReactComponentEnvironment');
var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes');
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactErrorUtils = require('ReactErrorUtils');
var ReactFeatureFlags = require('ReactFeatureFlags');
var ReactInstanceMap = require('ReactInstanceMap');
@@ -24,15 +24,15 @@ var ReactReconciler = require('ReactReconciler');
if (__DEV__) {
var checkReactTypeSpec = require('checkReactTypeSpec');
- var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
+ var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');
var warningAboutMissingGetChildContext = {};
}
-var emptyObject = require('emptyObject');
-var invariant = require('invariant');
-var shallowEqual = require('shallowEqual');
+var emptyObject = require('fbjs/lib/emptyObject');
+var invariant = require('fbjs/lib/invariant');
+var shallowEqual = require('fbjs/lib/shallowEqual');
var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
function StatelessComponent(Component) {
}
diff --git a/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js b/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
index b5db558d40..9f131fe323 100644
--- a/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
+++ b/src/renderers/shared/stack/reconciler/ReactDefaultBatchingStrategy.js
@@ -14,7 +14,7 @@
var ReactUpdates = require('ReactUpdates');
var Transaction = require('Transaction');
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
var RESET_BATCHED_UPDATES = {
initialize: emptyFunction,
diff --git a/src/renderers/shared/stack/reconciler/ReactHostComponent.js b/src/renderers/shared/stack/reconciler/ReactHostComponent.js
index eebe5cba46..75db824f6b 100644
--- a/src/renderers/shared/stack/reconciler/ReactHostComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactHostComponent.js
@@ -11,7 +11,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var genericComponentClass = null;
var textComponentClass = null;
diff --git a/src/renderers/shared/stack/reconciler/ReactMultiChild.js b/src/renderers/shared/stack/reconciler/ReactMultiChild.js
index 18fa1e8d0b..296ece9ab2 100644
--- a/src/renderers/shared/stack/reconciler/ReactMultiChild.js
+++ b/src/renderers/shared/stack/reconciler/ReactMultiChild.js
@@ -15,13 +15,13 @@ var ReactComponentEnvironment = require('ReactComponentEnvironment');
var ReactInstanceMap = require('ReactInstanceMap');
var ReactInstrumentation = require('ReactInstrumentation');
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactReconciler = require('ReactReconciler');
var ReactChildReconciler = require('ReactChildReconciler');
-var emptyFunction = require('emptyFunction');
+var emptyFunction = require('fbjs/lib/emptyFunction');
var flattenChildren = require('flattenChildren');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
/**
* Make an update for markup to be rendered and inserted at a supplied index.
diff --git a/src/renderers/shared/stack/reconciler/ReactNodeTypes.js b/src/renderers/shared/stack/reconciler/ReactNodeTypes.js
index 7b8d6f2094..2e24a6ba10 100644
--- a/src/renderers/shared/stack/reconciler/ReactNodeTypes.js
+++ b/src/renderers/shared/stack/reconciler/ReactNodeTypes.js
@@ -14,9 +14,9 @@
type ReactNodeType = 0 | 1 | 2;
-var React = require('React');
+var React = require('react');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var ReactNodeTypes = {
HOST: 0,
diff --git a/src/renderers/shared/stack/reconciler/ReactOwner.js b/src/renderers/shared/stack/reconciler/ReactOwner.js
index b6c67fffc7..21165f8f1b 100644
--- a/src/renderers/shared/stack/reconciler/ReactOwner.js
+++ b/src/renderers/shared/stack/reconciler/ReactOwner.js
@@ -14,8 +14,8 @@
var { ClassComponent } = require('ReactTypeOfWork');
-var emptyObject = require('emptyObject');
-var invariant = require('invariant');
+var emptyObject = require('fbjs/lib/emptyObject');
+var invariant = require('fbjs/lib/invariant');
import type { Fiber } from 'ReactFiber';
import type { ReactInstance } from 'ReactInstanceType';
diff --git a/src/renderers/shared/stack/reconciler/ReactReconciler.js b/src/renderers/shared/stack/reconciler/ReactReconciler.js
index 14a4191710..aafe0fbb7d 100644
--- a/src/renderers/shared/stack/reconciler/ReactReconciler.js
+++ b/src/renderers/shared/stack/reconciler/ReactReconciler.js
@@ -14,7 +14,7 @@
var ReactRef = require('ReactRef');
var ReactInstrumentation = require('ReactInstrumentation');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
/**
* Helper to call ReactRef.attachRefs with this composite component, split out
diff --git a/src/renderers/shared/stack/reconciler/ReactRef.js b/src/renderers/shared/stack/reconciler/ReactRef.js
index 54167d2c7d..120c6dddbd 100644
--- a/src/renderers/shared/stack/reconciler/ReactRef.js
+++ b/src/renderers/shared/stack/reconciler/ReactRef.js
@@ -21,8 +21,8 @@ var ReactRef = {};
if (__DEV__) {
var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes');
- var ReactComponentTreeHook = require('ReactComponentTreeHook');
- var warning = require('warning');
+ var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+ var warning = require('fbjs/lib/warning');
var warnedAboutStatelessRefs = {};
}
diff --git a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
index 12c7fd30f0..0058f06df5 100644
--- a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
+++ b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
@@ -11,13 +11,13 @@
'use strict';
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var ReactInstanceMap = require('ReactInstanceMap');
var ReactInstrumentation = require('ReactInstrumentation');
var ReactUpdates = require('ReactUpdates');
if (__DEV__) {
- var warning = require('warning');
+ var warning = require('fbjs/lib/warning');
var warnOnInvalidCallback = function(callback : mixed, callerName : string) {
warning(
callback === null || typeof callback === 'function',
diff --git a/src/renderers/shared/stack/reconciler/ReactUpdates.js b/src/renderers/shared/stack/reconciler/ReactUpdates.js
index 9a40713247..acf78af5f4 100644
--- a/src/renderers/shared/stack/reconciler/ReactUpdates.js
+++ b/src/renderers/shared/stack/reconciler/ReactUpdates.js
@@ -16,7 +16,7 @@ var ReactFeatureFlags = require('ReactFeatureFlags');
var ReactReconciler = require('ReactReconciler');
var Transaction = require('Transaction');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var dirtyComponents = [];
var updateBatchNumber = 0;
diff --git a/src/renderers/shared/stack/reconciler/Transaction.js b/src/renderers/shared/stack/reconciler/Transaction.js
index afa8bc9b38..36d9634b3c 100644
--- a/src/renderers/shared/stack/reconciler/Transaction.js
+++ b/src/renderers/shared/stack/reconciler/Transaction.js
@@ -12,7 +12,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var OBSERVED_ERROR = {};
diff --git a/src/renderers/shared/stack/reconciler/instantiateReactComponent.js b/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
index ae95812946..4fab1a3b20 100644
--- a/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
+++ b/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
@@ -16,8 +16,8 @@ var ReactEmptyComponent = require('ReactEmptyComponent');
var ReactHostComponent = require('ReactHostComponent');
var getNextDebugID = require('getNextDebugID');
-var invariant = require('invariant');
-var warning = require('warning');
+var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
// To avoid a cyclic dependency, we create the final class in this module
var ReactCompositeComponentWrapper = function(element) {
diff --git a/src/renderers/shared/utils/accumulate.js b/src/renderers/shared/utils/accumulate.js
index 4c84da6f9b..029b2bad30 100644
--- a/src/renderers/shared/utils/accumulate.js
+++ b/src/renderers/shared/utils/accumulate.js
@@ -12,7 +12,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
/**
* Accumulates items that must not be null or undefined.
diff --git a/src/renderers/shared/utils/accumulateInto.js b/src/renderers/shared/utils/accumulateInto.js
index 3e212ce13b..851cf79f14 100644
--- a/src/renderers/shared/utils/accumulateInto.js
+++ b/src/renderers/shared/utils/accumulateInto.js
@@ -12,7 +12,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
/**
* Accumulates items that must not be null or undefined into the first one. This
diff --git a/src/renderers/shared/utils/validateCallback.js b/src/renderers/shared/utils/validateCallback.js
index 657265b84f..ab8fda9de3 100644
--- a/src/renderers/shared/utils/validateCallback.js
+++ b/src/renderers/shared/utils/validateCallback.js
@@ -12,7 +12,7 @@
'use strict';
-const invariant = require('invariant');
+const invariant = require('fbjs/lib/invariant');
function validateCallback(callback: ?Function) {
invariant(
diff --git a/src/renderers/testing/ReactTestRendererFiber.js b/src/renderers/testing/ReactTestRendererFiber.js
index 7aba7553ba..a9fb64ccd6 100644
--- a/src/renderers/testing/ReactTestRendererFiber.js
+++ b/src/renderers/testing/ReactTestRendererFiber.js
@@ -15,9 +15,9 @@
var ReactFiberReconciler = require('ReactFiberReconciler');
var ReactGenericBatching = require('ReactGenericBatching');
-var emptyObject = require('emptyObject');
+var emptyObject = require('fbjs/lib/emptyObject');
var ReactTypeOfWork = require('ReactTypeOfWork');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var {
FunctionalComponent,
ClassComponent,
diff --git a/src/renderers/testing/__tests__/ReactTestRenderer-test.js b/src/renderers/testing/__tests__/ReactTestRenderer-test.js
index ef2b6124f6..54a7c7c98b 100644
--- a/src/renderers/testing/__tests__/ReactTestRenderer-test.js
+++ b/src/renderers/testing/__tests__/ReactTestRenderer-test.js
@@ -11,7 +11,7 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactTestRenderer = require('ReactTestRenderer');
var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
var prettyFormat = require('pretty-format');
diff --git a/src/renderers/testing/stack/ReactTestMount.js b/src/renderers/testing/stack/ReactTestMount.js
index f2af003406..cd14ada51e 100644
--- a/src/renderers/testing/stack/ReactTestMount.js
+++ b/src/renderers/testing/stack/ReactTestMount.js
@@ -11,14 +11,14 @@
*/
'use strict';
-var React = require('React');
+var React = require('react');
var ReactReconciler = require('ReactReconciler');
var ReactUpdates = require('ReactUpdates');
-var emptyObject = require('emptyObject');
+var emptyObject = require('fbjs/lib/emptyObject');
var getHostComponentFromComposite = require('getHostComponentFromComposite');
var instantiateReactComponent = require('instantiateReactComponent');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
export type TestRendererOptions = {
createNodeMock: (element: ReactElement) => any,
diff --git a/src/renderers/testing/stack/ReactTestRendererStack.js b/src/renderers/testing/stack/ReactTestRendererStack.js
index e0a9355e33..ce61abb80a 100644
--- a/src/renderers/testing/stack/ReactTestRendererStack.js
+++ b/src/renderers/testing/stack/ReactTestRendererStack.js
@@ -23,7 +23,7 @@ var ReactTestReconcileTransaction = require('ReactTestReconcileTransaction');
var ReactUpdates = require('ReactUpdates');
var ReactTestTextComponent = require('ReactTestTextComponent');
var ReactTestEmptyComponent = require('ReactTestEmptyComponent');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
import type { ReactElement } from 'ReactElementType';
import type { ReactInstance } from 'ReactInstanceType';
diff --git a/src/shared/types/checkReactTypeSpec.js b/src/shared/types/checkReactTypeSpec.js
index c7ed4d8167..b115ee3f70 100644
--- a/src/shared/types/checkReactTypeSpec.js
+++ b/src/shared/types/checkReactTypeSpec.js
@@ -11,8 +11,8 @@
'use strict';
-var checkPropTypes = require('checkPropTypes');
-var { getStackAddendum } = require('ReactDebugCurrentFrame');
+var checkPropTypes = require('react/lib/checkPropTypes');
+var { getStackAddendum } = require('react/lib/ReactDebugCurrentFrame');
function checkReactTypeSpec(
typeSpecs,
diff --git a/src/shared/utils/PooledClass.js b/src/shared/utils/PooledClass.js
index 406a3f1ef7..c2a6fa5322 100644
--- a/src/shared/utils/PooledClass.js
+++ b/src/shared/utils/PooledClass.js
@@ -12,7 +12,7 @@
'use strict';
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
/**
* Static poolers. Several custom versions for each potential number of
diff --git a/src/shared/utils/deprecated.js b/src/shared/utils/deprecated.js
index e8cc2e1539..c723831081 100644
--- a/src/shared/utils/deprecated.js
+++ b/src/shared/utils/deprecated.js
@@ -12,7 +12,7 @@
'use strict';
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
/**
* This will log a single deprecation notice per function and forward the call
diff --git a/src/shared/utils/flattenChildren.js b/src/shared/utils/flattenChildren.js
index d3625bc4b0..d07630580f 100644
--- a/src/shared/utils/flattenChildren.js
+++ b/src/shared/utils/flattenChildren.js
@@ -14,7 +14,7 @@
var KeyEscapeUtils = require('KeyEscapeUtils');
var traverseAllChildren = require('traverseAllChildren');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var ReactComponentTreeHook;
@@ -28,7 +28,7 @@ if (
// https://github.com/facebook/react/issues/7240
// Remove the inline requires when we don't need them anymore:
// https://github.com/facebook/react/pull/7178
- ReactComponentTreeHook = require('ReactComponentTreeHook');
+ ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
}
/**
@@ -49,7 +49,7 @@ function flattenSingleChildIntoContext(
const keyUnique = (result[name] === undefined);
if (__DEV__) {
if (!ReactComponentTreeHook) {
- ReactComponentTreeHook = require('ReactComponentTreeHook');
+ ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
}
if (!keyUnique) {
warning(
diff --git a/src/shared/utils/traverseAllChildren.js b/src/shared/utils/traverseAllChildren.js
index f84a6af300..0ec33d7ce4 100644
--- a/src/shared/utils/traverseAllChildren.js
+++ b/src/shared/utils/traverseAllChildren.js
@@ -11,13 +11,13 @@
'use strict';
-var ReactCurrentOwner = require('ReactCurrentOwner');
+var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
var REACT_ELEMENT_TYPE = require('ReactElementSymbol');
var getIteratorFn = require('getIteratorFn');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var KeyEscapeUtils = require('KeyEscapeUtils');
-var warning = require('warning');
+var warning = require('fbjs/lib/warning');
var SEPARATOR = '.';
var SUBSEPARATOR = ':';
diff --git a/src/test/ReactComponentTreeTestUtils.js b/src/test/ReactComponentTreeTestUtils.js
index e4f0a08038..60afbb4b15 100644
--- a/src/test/ReactComponentTreeTestUtils.js
+++ b/src/test/ReactComponentTreeTestUtils.js
@@ -11,7 +11,7 @@
'use strict';
-var ReactComponentTreeHook = require('ReactComponentTreeHook');
+var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
function getRootDisplayNames() {
return ReactComponentTreeHook.getRootIDs()
diff --git a/src/test/ReactShallowRenderer.js b/src/test/ReactShallowRenderer.js
index ee50d9d6ef..6e70f9b99d 100644
--- a/src/test/ReactShallowRenderer.js
+++ b/src/test/ReactShallowRenderer.js
@@ -12,16 +12,16 @@
'use strict';
-var React = require('React');
+var React = require('react');
var ReactDOMInjection = require('ReactDOMInjection');
var ReactDOMStackInjection = require('ReactDOMStackInjection');
var ReactCompositeComponent = require('ReactCompositeComponent');
var ReactReconciler = require('ReactReconciler');
var ReactUpdates = require('ReactUpdates');
-var emptyObject = require('emptyObject');
+var emptyObject = require('fbjs/lib/emptyObject');
var getNextDebugID = require('getNextDebugID');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
class NoopInternalComponent {
constructor(element) {
diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js
index 7a01f13cb7..308f74f5fe 100644
--- a/src/test/ReactTestUtils.js
+++ b/src/test/ReactTestUtils.js
@@ -15,20 +15,20 @@ var EventConstants = require('EventConstants');
var EventPluginHub = require('EventPluginHub');
var EventPluginRegistry = require('EventPluginRegistry');
var EventPropagators = require('EventPropagators');
-var React = require('React');
+var React = require('react');
var ReactControlledComponent = require('ReactControlledComponent');
-var ReactDOM = require('ReactDOM');
+var ReactDOM = require('react-dom');
var ReactDOMComponentTree = require('ReactDOMComponentTree');
var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
var ReactFiberTreeReflection = require('ReactFiberTreeReflection');
-var ReactInstanceMap = require('ReactInstanceMap');
+var ReactInstanceMap = require('react-dom/lib/ReactInstanceMap');
var ReactTypeOfWork = require('ReactTypeOfWork');
var ReactGenericBatching = require('ReactGenericBatching');
var SyntheticEvent = require('SyntheticEvent');
var ReactShallowRenderer = require('ReactShallowRenderer');
var findDOMNode = require('findDOMNode');
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
var topLevelTypes = EventConstants.topLevelTypes;
var {
diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js
index d38caa49c9..4afb19af5b 100644
--- a/src/test/__tests__/ReactTestUtils-test.js
+++ b/src/test/__tests__/ReactTestUtils-test.js
@@ -19,9 +19,9 @@ var ReactTestUtils;
describe('ReactTestUtils', () => {
beforeEach(() => {
- React = require('React');
- ReactDOM = require('ReactDOM');
- ReactDOMServer = require('ReactDOMServer');
+ React = require('react');
+ ReactDOM = require('react-dom');
+ ReactDOMServer = require('react-dom/server');
ReactTestUtils = require('ReactTestUtils');
});
diff --git a/src/test/__tests__/reactComponentExpect-test.js b/src/test/__tests__/reactComponentExpect-test.js
index 9fc433af11..02d4dd32ee 100644
--- a/src/test/__tests__/reactComponentExpect-test.js
+++ b/src/test/__tests__/reactComponentExpect-test.js
@@ -18,7 +18,7 @@ var reactComponentExpect;
describe('reactComponentExpect', () => {
beforeEach(() => {
- React = require('React');
+ React = require('react');
ReactTestUtils = require('ReactTestUtils');
reactComponentExpect = require('reactComponentExpect');
});
diff --git a/src/test/reactComponentExpect.js b/src/test/reactComponentExpect.js
index 48d9092dbb..65a4394236 100644
--- a/src/test/reactComponentExpect.js
+++ b/src/test/reactComponentExpect.js
@@ -11,15 +11,15 @@
'use strict';
-var ReactInstanceMap = require('ReactInstanceMap');
-var ReactTestUtils = require('ReactTestUtils');
+var ReactInstanceMap = require('react-dom/lib/ReactInstanceMap');
+var ReactTestUtils = require('react-dom/lib/ReactTestUtils');
var ReactTypeOfWork = require('ReactTypeOfWork');
var {
HostText,
} = ReactTypeOfWork;
-var invariant = require('invariant');
+var invariant = require('fbjs/lib/invariant');
// Fiber doesn't actually have an instance for empty components
// but we'll pretend it does while we keep compatibility with Stack.
diff --git a/src/umd/ReactDOMUMDEntry.js b/src/umd/ReactDOMUMDEntry.js
index 03a0318a10..be641918b0 100644
--- a/src/umd/ReactDOMUMDEntry.js
+++ b/src/umd/ReactDOMUMDEntry.js
@@ -11,8 +11,8 @@
'use strict';
-var React = require('React');
-var ReactDOM = require('ReactDOM');
+var React = require('react');
+var ReactDOM = require('react-dom');
var ReactDOMUMDEntry = ReactDOM;
@@ -20,8 +20,8 @@ if (__DEV__) {
ReactDOMUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
// ReactPerf and ReactTestUtils currently only work with the DOM renderer
// so we expose them from here, but only in DEV mode.
- ReactPerf: require('ReactPerf'),
- ReactTestUtils: require('ReactTestUtils'),
+ ReactPerf: require('react-dom/lib/ReactPerf'),
+ ReactTestUtils: require('react-dom/lib/ReactTestUtils'),
};
}
diff --git a/src/umd/ReactUMDEntry.js b/src/umd/ReactUMDEntry.js
index 0fa6a7fd52..ab926354a6 100644
--- a/src/umd/ReactUMDEntry.js
+++ b/src/umd/ReactUMDEntry.js
@@ -16,7 +16,7 @@ var React = require('React');
// `version` will be added here by the React module.
var ReactUMDEntry = Object.assign({
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
- ReactCurrentOwner: require('ReactCurrentOwner'),
+ ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),
},
}, React);
@@ -25,7 +25,7 @@ if (__DEV__) {
ReactUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
{
// ReactComponentTreeHook should not be included in production.
- ReactComponentTreeHook: require('ReactComponentTreeHook'),
+ ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
}
);
}
diff --git a/src/umd/ReactWithAddonsUMDEntry.js b/src/umd/ReactWithAddonsUMDEntry.js
index c59e62e731..c36ade28a9 100644
--- a/src/umd/ReactWithAddonsUMDEntry.js
+++ b/src/umd/ReactWithAddonsUMDEntry.js
@@ -17,7 +17,7 @@ var ReactWithAddons = require('ReactWithAddons');
var ReactWithAddonsUMDEntry = Object.assign({
__SECRET_INJECTED_REACT_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: null, // Will be injected by ReactDOM UMD build.
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
- ReactCurrentOwner: require('ReactCurrentOwner'),
+ ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),
},
}, ReactWithAddons);
@@ -26,7 +26,7 @@ if (__DEV__) {
ReactWithAddonsUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
{
// ReactComponentTreeHook should not be included in production.
- ReactComponentTreeHook: require('ReactComponentTreeHook'),
+ ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
}
);
}