Add scaffolding for importing an inlined renderer

packages/react-art/src/ReactART.js

@@ -6,12 +6,11 @@
  */
 
 import React from 'react';
-import ReactFiberReconciler from 'react-reconciler';
+import ARTRenderer from 'react-reconciler/inline';
 import Transform from 'art/core/transform';
 import Mode from 'art/modes/current';
 import FastNoSideEffects from 'art/modes/fast-noSideEffects';
 
-import ReactARTHostConfig from './ReactARTHostConfig';
 import {TYPES, childrenAsString} from './ReactARTInternals';
 
 Mode.setCurrent(
@@ -132,10 +131,6 @@ class Text extends React.Component {
   }
 }
 
-/** ART Renderer */
-
-const ARTRenderer = ReactFiberReconciler(ReactARTHostConfig);
-
 /** API */
 
 export const ClippingRectangle = TYPES.CLIPPING_RECTANGLE;

packages/react-art/src/__tests__/ReactART-test.js

@@ -15,22 +15,26 @@ const React = require('react');
 const ReactDOM = require('react-dom');
 const ReactTestUtils = require('react-dom/test-utils');
 
-let Group;
-let Shape;
-let Surface;
-let TestComponent;
-
-const Missing = {};
+// Isolate test renderer.
+jest.resetModules();
+const ReactTestRenderer = require('react-test-renderer');
 
+// Isolate ART renderer.
+jest.resetModules();
 const ReactART = require('react-art');
 const ARTSVGMode = require('art/modes/svg');
 const ARTCurrentMode = require('art/modes/current');
-
-const renderer = require('react-test-renderer');
 const Circle = require('react-art/Circle');
 const Rectangle = require('react-art/Rectangle');
 const Wedge = require('react-art/Wedge');
 
+let Group;
+let Shape;
+let Surface;
+let TestComponent;
+
+const Missing = {};
+
 function testDOMNodeStructure(domNode, expectedStructure) {
   expect(domNode).toBeDefined();
   expect(domNode.nodeName).toBe(expectedStructure.nodeName);
@@ -362,7 +366,7 @@ describe('ReactART', () => {
 
     // Using test renderer instead of the DOM renderer here because async
     // testing APIs for the DOM renderer don't exist.
-    const testRenderer = renderer.create(
+    const testRenderer = ReactTestRenderer.create(
       <CurrentRendererContext.Provider value="Test">
         <Yield value="A" />
         <Yield value="B" />
@@ -397,15 +401,15 @@ describe('ReactART', () => {
 
 describe('ReactARTComponents', () => {
   it('should generate a <Shape> with props for drawing the Circle', () => {
-    const circle = renderer.create(
+    const circle = ReactTestRenderer.create(
       <Circle radius={10} stroke="green" strokeWidth={3} fill="blue" />,
     );
     expect(circle.toJSON()).toMatchSnapshot();
   });
 
   it('should warn if radius is missing on a Circle component', () => {
     expect(() =>
-      renderer.create(<Circle stroke="green" strokeWidth={3} fill="blue" />),
+      ReactTestRenderer.create(<Circle stroke="green" strokeWidth={3} fill="blue" />),
     ).toWarnDev(
       'Warning: Failed prop type: The prop `radius` is marked as required in `Circle`, ' +
         'but its value is `undefined`.' +
@@ -414,15 +418,15 @@ describe('ReactARTComponents', () => {
   });
 
   it('should generate a <Shape> with props for drawing the Rectangle', () => {
-    const rectangle = renderer.create(
+    const rectangle = ReactTestRenderer.create(
       <Rectangle width={50} height={50} stroke="green" fill="blue" />,
     );
     expect(rectangle.toJSON()).toMatchSnapshot();
   });
 
   it('should warn if width/height is missing on a Rectangle component', () => {
     expect(() =>
-      renderer.create(<Rectangle stroke="green" fill="blue" />),
+      ReactTestRenderer.create(<Rectangle stroke="green" fill="blue" />),
     ).toWarnDev([
       'Warning: Failed prop type: The prop `width` is marked as required in `Rectangle`, ' +
         'but its value is `undefined`.' +
@@ -434,21 +438,21 @@ describe('ReactARTComponents', () => {
   });
 
   it('should generate a <Shape> with props for drawing the Wedge', () => {
-    const wedge = renderer.create(
+    const wedge = ReactTestRenderer.create(
       <Wedge outerRadius={50} startAngle={0} endAngle={360} fill="blue" />,
     );
     expect(wedge.toJSON()).toMatchSnapshot();
   });
 
   it('should return null if startAngle equals to endAngle on Wedge', () => {
-    const wedge = renderer.create(
+    const wedge = ReactTestRenderer.create(
       <Wedge outerRadius={50} startAngle={0} endAngle={0} fill="blue" />,
     );
     expect(wedge.toJSON()).toBeNull();
   });
 
   it('should warn if outerRadius/startAngle/endAngle is missing on a Wedge component', () => {
-    expect(() => renderer.create(<Wedge fill="blue" />)).toWarnDev([
+    expect(() => ReactTestRenderer.create(<Wedge fill="blue" />)).toWarnDev([
       'Warning: Failed prop type: The prop `outerRadius` is marked as required in `Wedge`, ' +
         'but its value is `undefined`.' +
         '\n    in Wedge (at **)',

packages/react-dom/src/client/ReactDOM.js

@@ -19,7 +19,7 @@ import type {Container} from './ReactDOMHostConfig';
 import '../shared/checkReact';
 import './ReactDOMClientInjection';
 
-import ReactFiberReconciler from 'react-reconciler';
+import DOMRenderer from 'react-reconciler/inline';
 import * as ReactPortal from 'shared/ReactPortal';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
@@ -35,7 +35,6 @@ import invariant from 'fbjs/lib/invariant';
 import lowPriorityWarning from 'shared/lowPriorityWarning';
 import warning from 'fbjs/lib/warning';
 
-import ReactDOMHostConfig from './ReactDOMHostConfig';
 import * as ReactDOMComponentTree from './ReactDOMComponentTree';
 import * as ReactDOMFiberComponent from './ReactDOMFiberComponent';
 import * as ReactDOMEventListener from '../events/ReactDOMEventListener';
@@ -447,8 +446,6 @@ function shouldHydrateDueToLegacyHeuristic(container) {
   );
 }
 
-const DOMRenderer = ReactFiberReconciler(ReactDOMHostConfig);
-
 ReactGenericBatching.injection.injectRenderer(DOMRenderer);
 
 let warnedAboutHydrateAPI = false;

packages/react-native-renderer/src/ReactFabric.js

@@ -12,14 +12,15 @@ import type {ReactNodeList} from 'shared/ReactTypes';
 
 import './ReactFabricInjection';
 
+import ReactFabricRenderer from 'react-reconciler/inline';
+
 import * as ReactPortal from 'shared/ReactPortal';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
 import ReactVersion from 'shared/ReactVersion';
 
 import NativeMethodsMixin from './NativeMethodsMixin';
 import ReactNativeComponent from './ReactNativeComponent';
 import * as ReactNativeComponentTree from './ReactNativeComponentTree';
-import ReactFabricRenderer from './ReactFabricRenderer';
 import {getInspectorDataForViewTag} from './ReactNativeFiberInspector';
 
 import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';

packages/react-native-renderer/src/ReactNativeRenderer.js

@@ -12,7 +12,7 @@ import type {ReactNodeList} from 'shared/ReactTypes';
 
 import './ReactNativeInjection';
 
-import ReactFiberReconciler from 'react-reconciler';
+import ReactNativeFiberRenderer from 'react-reconciler/inline';
 import * as ReactPortal from 'shared/ReactPortal';
 import * as ReactGenericBatching from 'events/ReactGenericBatching';
 import ReactVersion from 'shared/ReactVersion';
@@ -31,8 +31,6 @@ import {ReactCurrentOwner} from 'shared/ReactGlobalSharedState';
 import getComponentName from 'shared/getComponentName';
 import warning from 'fbjs/lib/warning';
 
-const ReactNativeFiberRenderer = ReactFiberReconciler(ReactNativeHostConfig);
-
 const findHostInstance = ReactNativeFiberRenderer.findHostInstance;
 
 function findNodeHandle(componentOrHandle: any): ?number {

packages/react-reconciler/inline.js

@@ -0,0 +1 @@
+// TODO

packages/react-test-renderer/src/ReactTestRenderer.js

@@ -11,7 +11,7 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber';
 import type {FiberRoot} from 'react-reconciler/src/ReactFiberRoot';
 import type {Instance, TextInstance} from './ReactTestHostConfig';
 
-import ReactFiberReconciler from 'react-reconciler';
+import TestRenderer from 'react-reconciler/inline';
 import {batchedUpdates} from 'events/ReactGenericBatching';
 import {findCurrentFiberUsingSlowPath} from 'react-reconciler/reflection';
 import {
@@ -54,8 +54,6 @@ type FindOptions = $Shape<{
 
 export type Predicate = (node: ReactTestInstance) => ?boolean;
 
-const TestRenderer = ReactFiberReconciler(ReactTestHostConfig);
-
 const defaultTestOptions = {
   createNodeMock: function() {
     return null;

scripts/jest/setupMocks.js

@@ -1,7 +1,59 @@
+const obj = {};
+jest.mock('fbjs/lib/emptyObject', () => obj);
 
 jest.mock('react-reconciler', () => {
   return (config) => {
     jest.mock('react-reconciler/src/ReactFiberHostConfig', () => config);
     return require.requireActual('react-reconciler');
   };
 });
+
+jest.mock('react-test-renderer', () => {
+  jest.mock('react-reconciler/inline', () => {
+    jest.mock('react-reconciler/src/ReactFiberHostConfig',
+      () => require.requireActual('react-test-renderer/src/ReactTestHostConfig')
+    );
+    return require.requireActual('react-reconciler');
+  });
+  return require.requireActual('react-test-renderer');
+});
+
+jest.mock('react-dom', () => {
+  jest.mock('react-reconciler/inline', () => {
+    jest.mock('react-reconciler/src/ReactFiberHostConfig',
+      () => require.requireActual('react-dom/src/client/ReactDOMHostConfig')
+    );
+    return require.requireActual('react-reconciler');
+  });
+  return require.requireActual('react-dom');
+});
+
+jest.mock('react-art', () => {
+  jest.mock('react-reconciler/inline', () => {
+    jest.mock('react-reconciler/src/ReactFiberHostConfig',
+      () => require.requireActual('react-art/src/ReactARTHostConfig')
+    );
+    return require.requireActual('react-reconciler');
+  });
+  return require.requireActual('react-art');
+});
+
+jest.mock('react-native-renderer', () => {
+  jest.mock('react-reconciler/inline', () => {
+    jest.mock('react-reconciler/src/ReactFiberHostConfig',
+      () => require.requireActual('react-native-renderer/src/ReactNativeHostConfig')
+    );
+    return require.requireActual('react-reconciler');
+  });
+  return require.requireActual('react-native-renderer');
+});
+
+jest.mock('react-native-renderer/fabric', () => {
+  jest.mock('react-reconciler/inline', () => {
+    jest.mock('react-reconciler/src/ReactFiberHostConfig',
+      () => require.requireActual('react-native-renderer/src/ReactFabricHostConfig')
+    );
+    return require.requireActual('react-reconciler');
+  });
+  return require.requireActual('react-native-renderer/fabric');
+});