From c4dfd17c59214b88f28c7f0774a203af089d5d7d Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Fri, 10 Mar 2017 13:29:25 +0000 Subject: [PATCH] Change forwarding modules to import from -fb This is another, more direct fix for ReactPerf circular dependency --- scripts/rollup/forwarding/ReactBrowserEventEmitter.js | 2 +- scripts/rollup/forwarding/ReactChildren.js | 2 +- scripts/rollup/forwarding/ReactCurrentOwner.js | 2 +- scripts/rollup/forwarding/ReactElement.js | 2 +- scripts/rollup/forwarding/ReactInputSelection.js | 2 +- scripts/rollup/forwarding/ReactInstanceMap.js | 2 +- scripts/rollup/forwarding/ReactPerf.js | 2 +- scripts/rollup/forwarding/ReactTestUtils.js | 2 +- scripts/rollup/forwarding/SyntheticEvent.js | 2 +- scripts/rollup/forwarding/flattenChildren.js | 2 +- scripts/rollup/forwarding/getComponentName.js | 2 +- scripts/rollup/forwarding/getEventCharCode.js | 2 +- scripts/rollup/forwarding/getVendorPrefixedEventName.js | 2 +- scripts/rollup/forwarding/isEventSupported.js | 2 +- scripts/rollup/forwarding/onlyChild.js | 2 +- scripts/rollup/forwarding/renderSubtreeIntoContainer.js | 2 +- scripts/rollup/forwarding/sliceChildren.js | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/rollup/forwarding/ReactBrowserEventEmitter.js b/scripts/rollup/forwarding/ReactBrowserEventEmitter.js index 05e3954bf5..8449b820ff 100644 --- a/scripts/rollup/forwarding/ReactBrowserEventEmitter.js +++ b/scripts/rollup/forwarding/ReactBrowserEventEmitter.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactDOM'); +} = require('ReactDOM-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactBrowserEventEmitter; diff --git a/scripts/rollup/forwarding/ReactChildren.js b/scripts/rollup/forwarding/ReactChildren.js index 6685fcf852..6bd560ae01 100644 --- a/scripts/rollup/forwarding/ReactChildren.js +++ b/scripts/rollup/forwarding/ReactChildren.js @@ -14,6 +14,6 @@ const { Children, -} = require('React'); +} = require('React-fb'); module.exports = Children; diff --git a/scripts/rollup/forwarding/ReactCurrentOwner.js b/scripts/rollup/forwarding/ReactCurrentOwner.js index b7ae3ad863..ca1f92cd86 100644 --- a/scripts/rollup/forwarding/ReactCurrentOwner.js +++ b/scripts/rollup/forwarding/ReactCurrentOwner.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('React'); +} = require('React-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner; diff --git a/scripts/rollup/forwarding/ReactElement.js b/scripts/rollup/forwarding/ReactElement.js index f0dcff6908..4fe62fd414 100644 --- a/scripts/rollup/forwarding/ReactElement.js +++ b/scripts/rollup/forwarding/ReactElement.js @@ -12,7 +12,7 @@ const { createElement, -} = require('React'); +} = require('React-fb'); module.exports = { createElement: createElement, diff --git a/scripts/rollup/forwarding/ReactInputSelection.js b/scripts/rollup/forwarding/ReactInputSelection.js index 4917e3c6f2..1eb30aa6fd 100644 --- a/scripts/rollup/forwarding/ReactInputSelection.js +++ b/scripts/rollup/forwarding/ReactInputSelection.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactDOM'); +} = require('ReactDOM-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactInputSelection; diff --git a/scripts/rollup/forwarding/ReactInstanceMap.js b/scripts/rollup/forwarding/ReactInstanceMap.js index 2e956351e6..3d76595feb 100644 --- a/scripts/rollup/forwarding/ReactInstanceMap.js +++ b/scripts/rollup/forwarding/ReactInstanceMap.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('React'); +} = require('React-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactInstanceMap; diff --git a/scripts/rollup/forwarding/ReactPerf.js b/scripts/rollup/forwarding/ReactPerf.js index 02715f05bd..ed5a116ae7 100644 --- a/scripts/rollup/forwarding/ReactPerf.js +++ b/scripts/rollup/forwarding/ReactPerf.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactDOM'); +} = require('ReactDOM-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf; diff --git a/scripts/rollup/forwarding/ReactTestUtils.js b/scripts/rollup/forwarding/ReactTestUtils.js index 014909bd29..f7a9c7d175 100644 --- a/scripts/rollup/forwarding/ReactTestUtils.js +++ b/scripts/rollup/forwarding/ReactTestUtils.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactDOM'); +} = require('ReactDOM-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactTestUtils; diff --git a/scripts/rollup/forwarding/SyntheticEvent.js b/scripts/rollup/forwarding/SyntheticEvent.js index 2f30bbfe88..c8d3a22e33 100644 --- a/scripts/rollup/forwarding/SyntheticEvent.js +++ b/scripts/rollup/forwarding/SyntheticEvent.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactDOM'); +} = require('ReactDOM-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticEvent; diff --git a/scripts/rollup/forwarding/flattenChildren.js b/scripts/rollup/forwarding/flattenChildren.js index a728fd79d1..5e14769f7b 100644 --- a/scripts/rollup/forwarding/flattenChildren.js +++ b/scripts/rollup/forwarding/flattenChildren.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('React'); +} = require('React-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.flattenChildren; diff --git a/scripts/rollup/forwarding/getComponentName.js b/scripts/rollup/forwarding/getComponentName.js index fbad677f55..d14f0644df 100644 --- a/scripts/rollup/forwarding/getComponentName.js +++ b/scripts/rollup/forwarding/getComponentName.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('React'); +} = require('React-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getComponentName; diff --git a/scripts/rollup/forwarding/getEventCharCode.js b/scripts/rollup/forwarding/getEventCharCode.js index 122a59a17c..dae124e13e 100644 --- a/scripts/rollup/forwarding/getEventCharCode.js +++ b/scripts/rollup/forwarding/getEventCharCode.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactDOM'); +} = require('ReactDOM-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getEventCharCode; diff --git a/scripts/rollup/forwarding/getVendorPrefixedEventName.js b/scripts/rollup/forwarding/getVendorPrefixedEventName.js index 7d86b94e13..f3ade0b2cd 100644 --- a/scripts/rollup/forwarding/getVendorPrefixedEventName.js +++ b/scripts/rollup/forwarding/getVendorPrefixedEventName.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactDOM'); +} = require('ReactDOM-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getVendorPrefixedEventName; diff --git a/scripts/rollup/forwarding/isEventSupported.js b/scripts/rollup/forwarding/isEventSupported.js index f67de648ad..363eb7860e 100644 --- a/scripts/rollup/forwarding/isEventSupported.js +++ b/scripts/rollup/forwarding/isEventSupported.js @@ -14,6 +14,6 @@ const { __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, -} = require('ReactDOM'); +} = require('ReactDOM-fb'); module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.isEventSupported; diff --git a/scripts/rollup/forwarding/onlyChild.js b/scripts/rollup/forwarding/onlyChild.js index 1c7d5fc407..ffdadaf15c 100644 --- a/scripts/rollup/forwarding/onlyChild.js +++ b/scripts/rollup/forwarding/onlyChild.js @@ -10,7 +10,7 @@ */ 'use strict'; -var { Children } = require('React'); +var { Children } = require('React-fb'); var invariant = require('invariant'); diff --git a/scripts/rollup/forwarding/renderSubtreeIntoContainer.js b/scripts/rollup/forwarding/renderSubtreeIntoContainer.js index f69b3cc3e4..f2d3758888 100644 --- a/scripts/rollup/forwarding/renderSubtreeIntoContainer.js +++ b/scripts/rollup/forwarding/renderSubtreeIntoContainer.js @@ -11,6 +11,6 @@ 'use strict'; -var ReactDOM = require('ReactDOM'); +var ReactDOM = require('ReactDOM-fb'); module.exports = ReactDOM.unstable_renderSubtreeIntoContainer; diff --git a/scripts/rollup/forwarding/sliceChildren.js b/scripts/rollup/forwarding/sliceChildren.js index 93fa947f5f..5bf1e1c0ae 100644 --- a/scripts/rollup/forwarding/sliceChildren.js +++ b/scripts/rollup/forwarding/sliceChildren.js @@ -11,7 +11,7 @@ 'use strict'; -var { Children } = require('React'); +var { Children } = require('React-fb'); /** * Slice children that are typically specified as `props.children`. This version