Move files around

scripts/rollup/modules.js

@@ -75,13 +75,9 @@ function getNodeModules(bundleType) {
 
 function ignoreFBModules() {
   return [
-    // Shared mutable state.
-    // We forked an implementation of this into forwarding/.
     // At FB, we don't know them statically:
     'ReactFeatureFlags',
     'ReactDOMFeatureFlags',
-    // At FB, we fork this module for custom reporting flow:
-    'ReactErrorUtils',
   ];
 }
 
@@ -201,7 +197,7 @@ function replaceFbjsModuleAliases(bundleType) {
 // on the React bundle itself rather than require module directly.
 // For the React bundle, ReactCurrentOwner should be bundled as part of the bundle
 // itself and exposed on __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
-const shimReactCurrentOwner = resolve('./scripts/rollup/shims/ReactCurrentOwnerRollupShim.js');
+const shimReactCurrentOwner = resolve('./scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js');
 const realReactCurrentOwner = resolve('./src/isomorphic/classic/element/ReactCurrentOwner.js')
 
 function getReactCurrentOwnerModuleAlias(bundleType, isRenderer) {
@@ -219,7 +215,7 @@ function getReactCurrentOwnerModuleAlias(bundleType, isRenderer) {
 }
 
 // this works almost identically to the ReactCurrentOwner shim above
-const shimReactCheckPropTypes = resolve('./scripts/rollup/shims/ReactCheckPropTypesRollupShim.js');
+const shimReactCheckPropTypes = resolve('./scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js');
 const realCheckPropTypes = resolve('./src/isomorphic/classic/types/checkPropTypes.js')
 
 function getReactCheckPropTypesModuleAlias(bundleType, isRenderer) {
@@ -237,7 +233,7 @@ function getReactCheckPropTypesModuleAlias(bundleType, isRenderer) {
 }
 
 // this works almost identically to the ReactCurrentOwner shim above
-const shimReactComponentTreeHook = resolve('./scripts/rollup/shims/ReactComponentTreeHookRollupShim.js');
+const shimReactComponentTreeHook = resolve('./scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js');
 const realReactComponentTreeHook = resolve('./src/isomorphic/hooks/ReactComponentTreeHook.js');
 
 function getReactComponentTreeHookModuleAlias(bundleType, isRenderer) {

scripts/rollup/shims/facebook-www/ReactChildren.js

@@ -14,7 +14,7 @@
 
 const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('React-fb');
+} = require('React');
 
 // TODO: can't reexport public API because of
 // mapIntoWithKeyPrefixInternal() dependency in an addon.

scripts/rollup/shims/facebook-www/ReactCurrentOwner.js

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactCurrentOwner
+ * @flow
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('React');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner;

scripts/rollup/shims/facebook-www/ReactElement.js

@@ -14,7 +14,7 @@ const {
   createElement,
   createFactory,
   isValidElement,
-} = require('React-fb');
+} = require('React');
 
 module.exports = {
   createElement,

scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js

@@ -14,6 +14,6 @@
 
 const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('ReactDOMFiber-fb'); // It doesn't exist in Stack
+} = require('ReactDOMFiber-build'); // It doesn't exist in Stack
 
 module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactFiberErrorLogger;

scripts/rollup/shims/facebook-www/ReactPerf.js

@@ -14,6 +14,6 @@
 
 const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('ReactDOMStack-fb'); // It doesn't exist in Fiber
+} = require('ReactDOMStack-build'); // It doesn't exist in Fiber
 
 module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf;

scripts/rollup/shims/facebook-www/flattenChildren.js

@@ -14,6 +14,6 @@
 
 const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('React-fb');
+} = require('React');
 
 module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.flattenChildren;

scripts/rollup/shims/facebook-www/getComponentName.js

@@ -14,6 +14,6 @@
 
 const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('React-fb');
+} = require('React');
 
 module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getComponentName;

scripts/rollup/shims/facebook-www/onlyChild.js

@@ -10,6 +10,6 @@
  */
 'use strict';
 
-var { Children } = require('React-fb');
+var { Children } = require('React');
 
 module.exports = Children.only;