@samitouri / QOS-React / commits / 60016c448b

Export React as Named Exports instead of CommonJS (#18106)

* Add options for forked entry points We currently fork .fb.js entry points. This adds a few more options. .modern.fb.js - experimental FB builds .classic.fb.js - stable FB builds .fb.js - if no other FB build, use this for FB builds .experimental.js - experimental builds .stable.js - stable builds .js - used if no other override exists This will be used to have different ES exports for different builds. * Switch React to named exports * Export named exports from the export point itself We need to re-export the Flow exported types so we can use them in our code. We don't want to use the Flow types from upstream since it doesn't have the non-public APIs that we have. This should be able to use export * but I don't know why it doesn't work. This actually enables Flow typing of React which was just "any" before. This exposed some Flow errors that needs fixing. * Create forks for the react entrypoint None of our builds expose all exports and they all differ in at least one way, so we need four forks. * Set esModule flag to false We don't want to emit the esModule compatibility flag on our CommonJS output. For now we treat our named exports as if they're CommonJS. This is a potentially breaking change for scheduler (but all those apis are unstable), react-is and use-subscription. However, it seems unlikely that anyone would rely on this since these only have named exports. * Remove unused Feature Flags * Let jest observe the stable fork for stable tests This lets it do the negative test by ensuring that the right tests fail. However, this in turn will make other tests that are not behind __EXPERIMENTAL__ fail. So I need to do that next. * Put all tests that depend on exports behind __EXPERIMENTAL__ Since there's no way to override the exports using feature flags in .intern.js anymore we can't use these APIs in stable. The tradeoff here is that we can either enable the negative tests on "stable" that means experimental are expected to fail, or we can disable tests on stable. This is unfortunate since some of these APIs now run on a "stable" config at FB instead of the experimental. * Switch ReactDOM to named exports Same strategy as React. I moved the ReactDOMFB runtime injection to classic.fb.js Since we only fork the entrypoint, the `/testing` entrypoint needs to be forked too to re-export the same things plus `act`. This is a bit unfortunate. If it becomes a pattern we can consider forking in the module resolution deeply. fix flow * Fix ReactDOM Flow Types Now that ReactDOM is Flow type checked we need to fix up its types. * Configure jest to use stable entry for ReactDOM in non-experimental * Remove additional FeatureFlags that are no longer needed These are only flagging the exports and no implementation details so we can control them fully through the export overrides.

Sebastian Markbåge committed Feb 25, 2020 at 13:54 UTC 60016c448bb7d19fc989acd05dda5aca2e124381

62 files changed +1073 -670

packages/react-debug-tools/src/__tests__/ReactHooksInspection-test.internal.js

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

22 ReactDebugTools = require('react-debug-tools');

23 });

25 + if (!__EXPERIMENTAL__) {

26 + it("empty test so Jest doesn't complain", () => {});

27 + return;

28 + }

29 +

30 it('should inspect a simple useResponder hook', () => {

31 const TestResponder = React.DEPRECATED_createResponder('TestResponder', {});

packages/react-devtools-shared/src/devtools/ContextMenu/useContextMenu.js

+8 -4

@@ -19,18 +19,22 @@ export default function useContextMenu({

19 }: {|

20 data: Object,

21 id: string,

22 - ref: ElementRef<HTMLElement>,

22 + ref: {current: ElementRef<'div'> | null},

23 |}) {

24 const {showMenu} = useContext(RegistryContext);

26 useEffect(() => {

27 if (ref.current !== null) {

28 - const handleContextMenu = event => {

28 + const handleContextMenu = (event: MouseEvent | TouchEvent) => {

29 event.preventDefault();

30 event.stopPropagation();

32 - const pageX = event.pageX || (event.touches && event.touches[0].pageX);

33 - const pageY = event.pageY || (event.touches && event.touches[0].pageY);

32 + const pageX =

33 + event.pageX ||

34 + (event.touches && ((event: any): TouchEvent).touches[0].pageX);

35 + const pageY =

36 + event.pageY ||

37 + (event.touches && ((event: any): TouchEvent).touches[0].pageY);

39 showMenu({data, id, pageX, pageY});

40 };

packages/react-dom/index.classic.fb.js new

+46

@@ -0,0 +1,46 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +import {addUserTimingListener} from 'shared/ReactFeatureFlags';

11 +import {isEnabled} from './src/events/ReactDOMEventListener';

12 +import {getClosestInstanceFromNode} from './src/client/ReactDOMComponentTree';

13 +

14 +import {__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED} from './src/client/ReactDOM';

15 +

16 +// For classic WWW builds, include a few internals that are already in use.

17 +Object.assign((__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: any), {

18 + ReactBrowserEventEmitter: {

19 + isEnabled,

20 + },

21 + ReactDOMComponentTree: {

22 + getClosestInstanceFromNode,

23 + },

24 + // Perf experiment

25 + addUserTimingListener,

26 +});

27 +

28 +export {

29 + createPortal,

30 + unstable_batchedUpdates,

31 + flushSync,

32 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

33 + version,

34 + findDOMNode,

35 + hydrate,

36 + render,

37 + unmountComponentAtNode,

38 + createRoot,

39 + createBlockingRoot,

40 + unstable_discreteUpdates,

41 + unstable_flushDiscreteUpdates,

42 + unstable_flushControlled,

43 + unstable_scheduleHydration,

44 + unstable_renderSubtreeIntoContainer,

45 + unstable_createPortal,

46 +} from './src/client/ReactDOM';

packages/react-dom/index.experimental.js new

+34

@@ -0,0 +1,34 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export {

11 + createPortal,

12 + unstable_batchedUpdates,

13 + flushSync,

14 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

15 + version,

16 + // Disabled behind disableLegacyReactDOMAPIs

17 + findDOMNode,

18 + hydrate,

19 + render,

20 + unmountComponentAtNode,

21 + // exposeConcurrentModeAPIs

22 + createRoot,

23 + createBlockingRoot,

24 + unstable_discreteUpdates,

25 + unstable_flushDiscreteUpdates,

26 + unstable_flushControlled,

27 + unstable_scheduleHydration,

28 + // Disabled behind disableUnstableRenderSubtreeIntoContainer

29 + unstable_renderSubtreeIntoContainer,

30 + // Disabled behind disableUnstableCreatePortal

31 + // Temporary alias since we already shipped React 16 RC with it.

32 + // TODO: remove in React 17.

33 + unstable_createPortal,

34 +} from './src/client/ReactDOM';

packages/react-dom/index.fb.js deleted

-14

@@ -1,14 +0,0 @@

1 -/**

2 - * Copyright (c) Facebook, Inc. and its affiliates.

3 - *

4 - * This source code is licensed under the MIT license found in the

5 - * LICENSE file in the root directory of this source tree.

6 - */

7 -

8 -'use strict';

9 -

10 -const ReactDOMFB = require('./src/client/ReactDOMFB');

11 -

12 -// TODO: decide on the top-level export form.

13 -// This is hacky but makes it work with both Rollup and Jest.

14 -module.exports = ReactDOMFB.default || ReactDOMFB;

packages/react-dom/index.js

+1 -7

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

7 * @flow

8 */

10 -'use strict';

11 -

12 -const ReactDOM = require('./src/client/ReactDOM');

13 -

14 -// TODO: decide on the top-level export form.

15 -// This is hacky but makes it work with both Rollup and Jest.

16 -module.exports = ReactDOM.default || ReactDOM;

10 +export * from './src/client/ReactDOM';

packages/react-dom/index.modern.fb.js new

+22

@@ -0,0 +1,22 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export {

11 + createPortal,

12 + unstable_batchedUpdates,

13 + flushSync,

14 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

15 + version,

16 + createRoot,

17 + createBlockingRoot,

18 + unstable_discreteUpdates,

19 + unstable_flushDiscreteUpdates,

20 + unstable_flushControlled,

21 + unstable_scheduleHydration,

22 +} from './src/client/ReactDOM';

packages/react-dom/index.stable.js new

+24

@@ -0,0 +1,24 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export {

11 + createPortal,

12 + unstable_batchedUpdates,

13 + flushSync,

14 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

15 + version,

16 + findDOMNode,

17 + hydrate,

18 + render,

19 + unmountComponentAtNode,

20 + unstable_renderSubtreeIntoContainer,

21 + // Temporary alias since we already shipped React 16 RC with it.

22 + // TODO: remove in React 17.

23 + unstable_createPortal,

24 +} from './src/client/ReactDOM';

packages/react-dom/src/__tests__/ReactDOMFiber-test.js

+1 -3

@@ -13,8 +13,6 @@ const React = require('react');

13 const ReactDOM = require('react-dom');

14 const PropTypes = require('prop-types');

16 -const ReactFeatureFlags = require('shared/ReactFeatureFlags');

17 -

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

17 let container;

@@ -249,7 +247,7 @@ describe('ReactDOMFiber', () => {

247 });

248

249 // TODO: remove in React 17

252 - if (!ReactFeatureFlags.disableUnstableCreatePortal) {

250 + if (!__EXPERIMENTAL__) {

251 it('should support unstable_createPortal alias', () => {

252 const portalContainer = document.createElement('div');

253

packages/react-dom/src/__tests__/ReactDOMServerPartialHydration-test.internal.js

+99 -97

@@ -86,8 +86,6 @@ describe('ReactDOMServerPartialHydration', () => {

86 Scheduler = require('scheduler');

87 Suspense = React.Suspense;

88 SuspenseList = React.SuspenseList;

89 -

90 - useHover = require('react-interactions/events/hover').useHover;

89 });

91 if (!__EXPERIMENTAL__) {

@@ -2368,120 +2366,124 @@ describe('ReactDOMServerPartialHydration', () => {

2366 document.body.removeChild(container);

2367 });

2368

2371 - it('blocks only on the last continuous event (Responder system)', async () => {

2372 - let suspend1 = false;

2373 - let resolve1;

2374 - let promise1 = new Promise(resolvePromise => (resolve1 = resolvePromise));

2375 - let suspend2 = false;

2376 - let resolve2;

2377 - let promise2 = new Promise(resolvePromise => (resolve2 = resolvePromise));

2378 -

2379 - function First({text}) {

2380 - if (suspend1) {

2381 - throw promise1;

2382 - } else {

2383 - return 'Hello';

2369 + if (__EXPERIMENTAL__) {

2370 + it('blocks only on the last continuous event (Responder system)', async () => {

2371 + useHover = require('react-interactions/events/hover').useHover;

2372 +

2373 + let suspend1 = false;

2374 + let resolve1;

2375 + let promise1 = new Promise(resolvePromise => (resolve1 = resolvePromise));

2376 + let suspend2 = false;

2377 + let resolve2;

2378 + let promise2 = new Promise(resolvePromise => (resolve2 = resolvePromise));

2379 +

2380 + function First({text}) {

2381 + if (suspend1) {

2382 + throw promise1;

2383 + } else {

2384 + return 'Hello';

2385 + }

2386 }

2385 - }

2387

2387 - function Second({text}) {

2388 - if (suspend2) {

2389 - throw promise2;

2390 - } else {

2391 - return 'World';

2388 + function Second({text}) {

2389 + if (suspend2) {

2390 + throw promise2;

2391 + } else {

2392 + return 'World';

2393 + }

2394 }

2393 - }

2394 -

2395 - let ops = [];

2395

2397 - function App() {

2398 - const listener1 = useHover({

2399 - onHoverStart() {

2400 - ops.push('Hover Start First');

2401 - },

2402 - onHoverEnd() {

2403 - ops.push('Hover End First');

2404 - },

2405 - });

2406 - const listener2 = useHover({

2407 - onHoverStart() {

2408 - ops.push('Hover Start Second');

2409 - },

2410 - onHoverEnd() {

2411 - ops.push('Hover End Second');

2412 - },

2413 - });

2414 - return (

2415 - <div>

2416 - <Suspense fallback="Loading First...">

2417 - <span DEPRECATED_flareListeners={listener1} />

2418 - {/* We suspend after to test what happens when we eager

2396 + let ops = [];

2397 +

2398 + function App() {

2399 + const listener1 = useHover({

2400 + onHoverStart() {

2401 + ops.push('Hover Start First');

2402 + },

2403 + onHoverEnd() {

2404 + ops.push('Hover End First');

2405 + },

2406 + });

2407 + const listener2 = useHover({

2408 + onHoverStart() {

2409 + ops.push('Hover Start Second');

2410 + },

2411 + onHoverEnd() {

2412 + ops.push('Hover End Second');

2413 + },

2414 + });

2415 + return (

2416 + <div>

2417 + <Suspense fallback="Loading First...">

2418 + <span DEPRECATED_flareListeners={listener1} />

2419 + {/* We suspend after to test what happens when we eager

2420 attach the listener. */}

2420 - <First />

2421 - </Suspense>

2422 - <Suspense fallback="Loading Second...">

2423 - <span DEPRECATED_flareListeners={listener2}>

2424 - <Second />

2425 - </span>

2426 - </Suspense>

2427 - </div>

2428 - );

2429 - }

2421 + <First />

2422 + </Suspense>

2423 + <Suspense fallback="Loading Second...">

2424 + <span DEPRECATED_flareListeners={listener2}>

2425 + <Second />

2426 + </span>

2427 + </Suspense>

2428 + </div>

2429 + );

2430 + }

2431

2431 - let finalHTML = ReactDOMServer.renderToString(<App />);

2432 - let container = document.createElement('div');

2433 - container.innerHTML = finalHTML;

2432 + let finalHTML = ReactDOMServer.renderToString(<App />);

2433 + let container = document.createElement('div');

2434 + container.innerHTML = finalHTML;

2435

2435 - // We need this to be in the document since we'll dispatch events on it.

2436 - document.body.appendChild(container);

2436 + // We need this to be in the document since we'll dispatch events on it.

2437 + document.body.appendChild(container);

2438

2438 - let appDiv = container.getElementsByTagName('div')[0];

2439 - let firstSpan = appDiv.getElementsByTagName('span')[0];

2440 - let secondSpan = appDiv.getElementsByTagName('span')[1];

2441 - expect(firstSpan.textContent).toBe('');

2442 - expect(secondSpan.textContent).toBe('World');

2439 + let appDiv = container.getElementsByTagName('div')[0];

2440 + let firstSpan = appDiv.getElementsByTagName('span')[0];

2441 + let secondSpan = appDiv.getElementsByTagName('span')[1];

2442 + expect(firstSpan.textContent).toBe('');

2443 + expect(secondSpan.textContent).toBe('World');

2444

2444 - // On the client we don't have all data yet but we want to start

2445 - // hydrating anyway.

2446 - suspend1 = true;

2447 - suspend2 = true;

2448 - let root = ReactDOM.createRoot(container, {hydrate: true});

2449 - root.render(<App />);

2445 + // On the client we don't have all data yet but we want to start

2446 + // hydrating anyway.

2447 + suspend1 = true;

2448 + suspend2 = true;

2449 + let root = ReactDOM.createRoot(container, {hydrate: true});

2450 + root.render(<App />);

2451

2451 - Scheduler.unstable_flushAll();

2452 - jest.runAllTimers();

2452 + Scheduler.unstable_flushAll();

2453 + jest.runAllTimers();

2454

2454 - dispatchMouseEvent(appDiv, null);

2455 - dispatchMouseEvent(firstSpan, appDiv);

2456 - dispatchMouseEvent(secondSpan, firstSpan);

2455 + dispatchMouseEvent(appDiv, null);

2456 + dispatchMouseEvent(firstSpan, appDiv);

2457 + dispatchMouseEvent(secondSpan, firstSpan);

2458

2458 - // Neither target is yet hydrated.

2459 - expect(ops).toEqual([]);

2459 + // Neither target is yet hydrated.

2460 + expect(ops).toEqual([]);

2461

2461 - // Resolving the second promise so that rendering can complete.

2462 - suspend2 = false;

2463 - resolve2();

2464 - await promise2;

2462 + // Resolving the second promise so that rendering can complete.

2463 + suspend2 = false;

2464 + resolve2();

2465 + await promise2;

2466

2466 - Scheduler.unstable_flushAll();

2467 - jest.runAllTimers();

2467 + Scheduler.unstable_flushAll();

2468 + jest.runAllTimers();

2469

2469 - // We've unblocked the current hover target so we should be

2470 - // able to replay it now.

2471 - expect(ops).toEqual(['Hover Start Second']);

2470 + // We've unblocked the current hover target so we should be

2471 + // able to replay it now.

2472 + expect(ops).toEqual(['Hover Start Second']);

2473

2473 - // Resolving the first promise has no effect now.

2474 - suspend1 = false;

2475 - resolve1();

2476 - await promise1;

2474 + // Resolving the first promise has no effect now.

2475 + suspend1 = false;

2476 + resolve1();

2477 + await promise1;

2478

2478 - Scheduler.unstable_flushAll();

2479 - jest.runAllTimers();

2479 + Scheduler.unstable_flushAll();

2480 + jest.runAllTimers();

2481

2481 - expect(ops).toEqual(['Hover Start Second']);

2482 + expect(ops).toEqual(['Hover Start Second']);

2483

2483 - document.body.removeChild(container);

2484 - });

2484 + document.body.removeChild(container);

2485 + });

2486 + }

2487

2488 it('finishes normal pri work before continuing to hydrate a retry', async () => {

2489 let suspend = false;

packages/react-dom/src/__tests__/ReactDOMServerSelectiveHydration-test.internal.js

+188 -184

@@ -17,7 +17,6 @@ let ReactDOMServer;

17 let ReactTestUtils;

18 let Scheduler;

19 let Suspense;

20 -let usePress;

21 function dispatchMouseHoverEvent(to, from) {

22 if (!to) {

@@ -106,7 +105,6 @@ describe('ReactDOMServerSelectiveHydration', () => {

105 ReactTestUtils = require('react-dom/test-utils');

106 Scheduler = require('scheduler');

107 Suspense = React.Suspense;

109 - usePress = require('react-interactions/events/press').usePress;

108 });

109

110 if (!__EXPERIMENTAL__) {

@@ -352,240 +350,246 @@ describe('ReactDOMServerSelectiveHydration', () => {

350 document.body.removeChild(container);

351 });

352

355 - it('hydrates the target boundary synchronously during a click (flare)', async () => {

356 - function Child({text}) {

357 - Scheduler.unstable_yieldValue(text);

358 - const listener = usePress({

359 - onPress() {

360 - Scheduler.unstable_yieldValue('Clicked ' + text);

361 - },

362 - });

353 + if (__EXPERIMENTAL__) {

354 + it('hydrates the target boundary synchronously during a click (flare)', async () => {

355 + let usePress = require('react-interactions/events/press').usePress;

356

364 - return <span DEPRECATED_flareListeners={listener}>{text}</span>;

365 - }

357 + function Child({text}) {

358 + Scheduler.unstable_yieldValue(text);

359 + const listener = usePress({

360 + onPress() {

361 + Scheduler.unstable_yieldValue('Clicked ' + text);

362 + },

363 + });

364

367 - function App() {

368 - Scheduler.unstable_yieldValue('App');

369 - return (

370 - <div>

371 - <Suspense fallback="Loading...">

372 - <Child text="A" />

373 - </Suspense>

374 - <Suspense fallback="Loading...">

375 - <Child text="B" />

376 - </Suspense>

377 - </div>

378 - );

379 - }

365 + return <span DEPRECATED_flareListeners={listener}>{text}</span>;

366 + }

367

381 - let finalHTML = ReactDOMServer.renderToString(<App />);

368 + function App() {

369 + Scheduler.unstable_yieldValue('App');

370 + return (

371 + <div>

372 + <Suspense fallback="Loading...">

373 + <Child text="A" />

374 + </Suspense>

375 + <Suspense fallback="Loading...">

376 + <Child text="B" />

377 + </Suspense>

378 + </div>

379 + );

380 + }

381

383 - expect(Scheduler).toHaveYielded(['App', 'A', 'B']);

382 + let finalHTML = ReactDOMServer.renderToString(<App />);

383

385 - let container = document.createElement('div');

386 - // We need this to be in the document since we'll dispatch events on it.

387 - document.body.appendChild(container);

384 + expect(Scheduler).toHaveYielded(['App', 'A', 'B']);

385

389 - container.innerHTML = finalHTML;

386 + let container = document.createElement('div');

387 + // We need this to be in the document since we'll dispatch events on it.

388 + document.body.appendChild(container);

389

391 - let root = ReactDOM.createRoot(container, {hydrate: true});

392 - root.render(<App />);

390 + container.innerHTML = finalHTML;

391

394 - // Nothing has been hydrated so far.

395 - expect(Scheduler).toHaveYielded([]);

392 + let root = ReactDOM.createRoot(container, {hydrate: true});

393 + root.render(<App />);

394

397 - let span = container.getElementsByTagName('span')[1];

395 + // Nothing has been hydrated so far.

396 + expect(Scheduler).toHaveYielded([]);

397

399 - let target = createEventTarget(span);

398 + let span = container.getElementsByTagName('span')[1];

399

401 - // This should synchronously hydrate the root App and the second suspense

402 - // boundary.

403 - let preventDefault = jest.fn();

404 - target.virtualclick({preventDefault});

400 + let target = createEventTarget(span);

401

406 - // The event should have been canceled because we called preventDefault.

407 - expect(preventDefault).toHaveBeenCalled();

402 + // This should synchronously hydrate the root App and the second suspense

403 + // boundary.

404 + let preventDefault = jest.fn();

405 + target.virtualclick({preventDefault});

406

409 - // We rendered App, B and then invoked the event without rendering A.

410 - expect(Scheduler).toHaveYielded(['App', 'B', 'Clicked B']);

407 + // The event should have been canceled because we called preventDefault.

408 + expect(preventDefault).toHaveBeenCalled();

409

412 - // After continuing the scheduler, we finally hydrate A.

413 - expect(Scheduler).toFlushAndYield(['A']);

410 + // We rendered App, B and then invoked the event without rendering A.

411 + expect(Scheduler).toHaveYielded(['App', 'B', 'Clicked B']);

412

415 - document.body.removeChild(container);

416 - });

413 + // After continuing the scheduler, we finally hydrate A.

414 + expect(Scheduler).toFlushAndYield(['A']);

415

418 - it('hydrates at higher pri if sync did not work first time (flare)', async () => {

419 - let suspend = false;

420 - let resolve;

421 - let promise = new Promise(resolvePromise => (resolve = resolvePromise));

416 + document.body.removeChild(container);

417 + });

418

423 - function Child({text}) {

424 - if ((text === 'A' || text === 'D') && suspend) {

425 - throw promise;

419 + it('hydrates at higher pri if sync did not work first time (flare)', async () => {

420 + let usePress = require('react-interactions/events/press').usePress;

421 + let suspend = false;

422 + let resolve;

423 + let promise = new Promise(resolvePromise => (resolve = resolvePromise));

424 +

425 + function Child({text}) {

426 + if ((text === 'A' || text === 'D') && suspend) {

427 + throw promise;

428 + }

429 + Scheduler.unstable_yieldValue(text);

430 +

431 + const listener = usePress({

432 + onPress() {

433 + Scheduler.unstable_yieldValue('Clicked ' + text);

434 + },

435 + });

436 + return <span DEPRECATED_flareListeners={listener}>{text}</span>;

437 }

427 - Scheduler.unstable_yieldValue(text);

438

429 - const listener = usePress({

430 - onPress() {

431 - Scheduler.unstable_yieldValue('Clicked ' + text);

432 - },

433 - });

434 - return <span DEPRECATED_flareListeners={listener}>{text}</span>;

435 - }

439 + function App() {

440 + Scheduler.unstable_yieldValue('App');

441 + return (

442 + <div>

443 + <Suspense fallback="Loading...">

444 + <Child text="A" />

445 + </Suspense>

446 + <Suspense fallback="Loading...">

447 + <Child text="B" />

448 + </Suspense>

449 + <Suspense fallback="Loading...">

450 + <Child text="C" />

451 + </Suspense>

452 + <Suspense fallback="Loading...">

453 + <Child text="D" />

454 + </Suspense>

455 + </div>

456 + );

457 + }

458

437 - function App() {

438 - Scheduler.unstable_yieldValue('App');

439 - return (

440 - <div>

441 - <Suspense fallback="Loading...">

442 - <Child text="A" />

443 - </Suspense>

444 - <Suspense fallback="Loading...">

445 - <Child text="B" />

446 - </Suspense>

447 - <Suspense fallback="Loading...">

448 - <Child text="C" />

449 - </Suspense>

450 - <Suspense fallback="Loading...">

451 - <Child text="D" />

452 - </Suspense>

453 - </div>

454 - );

455 - }

459 + let finalHTML = ReactDOMServer.renderToString(<App />);

460

457 - let finalHTML = ReactDOMServer.renderToString(<App />);

461 + expect(Scheduler).toHaveYielded(['App', 'A', 'B', 'C', 'D']);

462

459 - expect(Scheduler).toHaveYielded(['App', 'A', 'B', 'C', 'D']);

463 + let container = document.createElement('div');

464 + // We need this to be in the document since we'll dispatch events on it.

465 + document.body.appendChild(container);

466

461 - let container = document.createElement('div');

462 - // We need this to be in the document since we'll dispatch events on it.

463 - document.body.appendChild(container);

467 + container.innerHTML = finalHTML;

468

465 - container.innerHTML = finalHTML;

469 + let spanD = container.getElementsByTagName('span')[3];

470

467 - let spanD = container.getElementsByTagName('span')[3];

471 + suspend = true;

472

469 - suspend = true;

473 + // A and D will be suspended. We'll click on D which should take

474 + // priority, after we unsuspend.

475 + let root = ReactDOM.createRoot(container, {hydrate: true});

476 + root.render(<App />);

477

471 - // A and D will be suspended. We'll click on D which should take

472 - // priority, after we unsuspend.

473 - let root = ReactDOM.createRoot(container, {hydrate: true});

474 - root.render(<App />);

478 + // Nothing has been hydrated so far.

479 + expect(Scheduler).toHaveYielded([]);

480

476 - // Nothing has been hydrated so far.

477 - expect(Scheduler).toHaveYielded([]);

481 + // This click target cannot be hydrated yet because it's suspended.

482 + let result = dispatchClickEvent(spanD);

483

479 - // This click target cannot be hydrated yet because it's suspended.

480 - let result = dispatchClickEvent(spanD);

484 + expect(Scheduler).toHaveYielded(['App']);

485

482 - expect(Scheduler).toHaveYielded(['App']);

486 + expect(result).toBe(true);

487

484 - expect(result).toBe(true);

488 + // Continuing rendering will render B next.

489 + expect(Scheduler).toFlushAndYield(['B', 'C']);

490

486 - // Continuing rendering will render B next.

487 - expect(Scheduler).toFlushAndYield(['B', 'C']);

491 + suspend = false;

492 + resolve();

493 + await promise;

494

489 - suspend = false;

490 - resolve();

491 - await promise;

495 + // After the click, we should prioritize D and the Click first,

496 + // and only after that render A and C.

497 + expect(Scheduler).toFlushAndYield(['D', 'Clicked D', 'A']);

498

493 - // After the click, we should prioritize D and the Click first,

494 - // and only after that render A and C.

495 - expect(Scheduler).toFlushAndYield(['D', 'Clicked D', 'A']);

499 + document.body.removeChild(container);

500 + });

501

497 - document.body.removeChild(container);

498 - });

502 + it('hydrates at higher pri for secondary discrete events (flare)', async () => {

503 + let usePress = require('react-interactions/events/press').usePress;

504 + let suspend = false;

505 + let resolve;

506 + let promise = new Promise(resolvePromise => (resolve = resolvePromise));

507

500 - it('hydrates at higher pri for secondary discrete events (flare)', async () => {

501 - let suspend = false;

502 - let resolve;

503 - let promise = new Promise(resolvePromise => (resolve = resolvePromise));

508 + function Child({text}) {

509 + if ((text === 'A' || text === 'D') && suspend) {

510 + throw promise;

511 + }

512 + Scheduler.unstable_yieldValue(text);

513

505 - function Child({text}) {

506 - if ((text === 'A' || text === 'D') && suspend) {

507 - throw promise;

514 + const listener = usePress({

515 + onPress() {

516 + Scheduler.unstable_yieldValue('Clicked ' + text);

517 + },

518 + });

519 + return <span DEPRECATED_flareListeners={listener}>{text}</span>;

520 }

509 - Scheduler.unstable_yieldValue(text);

521

511 - const listener = usePress({

512 - onPress() {

513 - Scheduler.unstable_yieldValue('Clicked ' + text);

514 - },

515 - });

516 - return <span DEPRECATED_flareListeners={listener}>{text}</span>;

517 - }

522 + function App() {

523 + Scheduler.unstable_yieldValue('App');

524 + return (

525 + <div>

526 + <Suspense fallback="Loading...">

527 + <Child text="A" />

528 + </Suspense>

529 + <Suspense fallback="Loading...">

530 + <Child text="B" />

531 + </Suspense>

532 + <Suspense fallback="Loading...">

533 + <Child text="C" />

534 + </Suspense>

535 + <Suspense fallback="Loading...">

536 + <Child text="D" />

537 + </Suspense>

538 + </div>

539 + );

540 + }

541

519 - function App() {

520 - Scheduler.unstable_yieldValue('App');

521 - return (

522 - <div>

523 - <Suspense fallback="Loading...">

524 - <Child text="A" />

525 - </Suspense>

526 - <Suspense fallback="Loading...">

527 - <Child text="B" />

528 - </Suspense>

529 - <Suspense fallback="Loading...">

530 - <Child text="C" />

531 - </Suspense>

532 - <Suspense fallback="Loading...">

533 - <Child text="D" />

534 - </Suspense>

535 - </div>

536 - );

537 - }

542 + let finalHTML = ReactDOMServer.renderToString(<App />);

543

539 - let finalHTML = ReactDOMServer.renderToString(<App />);

544 + expect(Scheduler).toHaveYielded(['App', 'A', 'B', 'C', 'D']);

545

541 - expect(Scheduler).toHaveYielded(['App', 'A', 'B', 'C', 'D']);

546 + let container = document.createElement('div');

547 + // We need this to be in the document since we'll dispatch events on it.

548 + document.body.appendChild(container);

549

543 - let container = document.createElement('div');

544 - // We need this to be in the document since we'll dispatch events on it.

545 - document.body.appendChild(container);

550 + container.innerHTML = finalHTML;

551

547 - container.innerHTML = finalHTML;

552 + let spanA = container.getElementsByTagName('span')[0];

553 + let spanC = container.getElementsByTagName('span')[2];

554 + let spanD = container.getElementsByTagName('span')[3];

555

549 - let spanA = container.getElementsByTagName('span')[0];

550 - let spanC = container.getElementsByTagName('span')[2];

551 - let spanD = container.getElementsByTagName('span')[3];

556 + suspend = true;

557

553 - suspend = true;

558 + // A and D will be suspended. We'll click on D which should take

559 + // priority, after we unsuspend.

560 + let root = ReactDOM.createRoot(container, {hydrate: true});

561 + root.render(<App />);

562

555 - // A and D will be suspended. We'll click on D which should take

556 - // priority, after we unsuspend.

557 - let root = ReactDOM.createRoot(container, {hydrate: true});

558 - root.render(<App />);

563 + // Nothing has been hydrated so far.

564 + expect(Scheduler).toHaveYielded([]);

565

560 - // Nothing has been hydrated so far.

561 - expect(Scheduler).toHaveYielded([]);

566 + // This click target cannot be hydrated yet because the first is Suspended.

567 + dispatchClickEvent(spanA);

568 + dispatchClickEvent(spanC);

569 + dispatchClickEvent(spanD);

570

563 - // This click target cannot be hydrated yet because the first is Suspended.

564 - dispatchClickEvent(spanA);

565 - dispatchClickEvent(spanC);

566 - dispatchClickEvent(spanD);

571 + expect(Scheduler).toHaveYielded(['App']);

572

568 - expect(Scheduler).toHaveYielded(['App']);

573 + suspend = false;

574 + resolve();

575 + await promise;

576

570 - suspend = false;

571 - resolve();

572 - await promise;

573 -

574 - // We should prioritize hydrating A, C and D first since we clicked in

575 - // them. Only after they're done will we hydrate B.

576 - expect(Scheduler).toFlushAndYield([

577 - 'A',

578 - 'Clicked A',

579 - 'C',

580 - 'Clicked C',

581 - 'D',

582 - 'Clicked D',

583 - // B should render last since it wasn't clicked.

584 - 'B',

585 - ]);

577 + // We should prioritize hydrating A, C and D first since we clicked in

578 + // them. Only after they're done will we hydrate B.

579 + expect(Scheduler).toFlushAndYield([

580 + 'A',

581 + 'Clicked A',

582 + 'C',

583 + 'Clicked C',

584 + 'D',

585 + 'Clicked D',

586 + // B should render last since it wasn't clicked.

587 + 'B',

588 + ]);

589

587 - document.body.removeChild(container);

588 - });

590 + document.body.removeChild(container);

591 + });

592 + }

593

594 it('hydrates the hovered targets as higher priority for continuous events', async () => {

595 let suspend = false;

packages/react-dom/src/__tests__/renderSubtreeIntoContainer-test.js

+1 -1

@@ -19,7 +19,7 @@ const renderSubtreeIntoContainer = require('react-dom')

19 const ReactFeatureFlags = require('shared/ReactFeatureFlags');

21 // Once this flag is always true, we should delete this test file

22 -if (ReactFeatureFlags.disableUnstableRenderSubtreeIntoContainer) {

22 +if (__EXPERIMENTAL__) {

23 describe('renderSubtreeIntoContainer', () => {

24 it('empty test', () => {

25 // Empty test to prevent "Your test suite must contain at least one test." error.

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

+90 -95

@@ -35,7 +35,6 @@ import {

35 attemptUserBlockingHydration,

36 attemptContinuousHydration,

37 attemptHydrationAtCurrentPriority,

38 - act,

38 } from 'react-reconciler/inline.dom';

39 import {createPortal as createPortalImpl} from 'shared/ReactPortal';

40 import {canUseDOM} from 'shared/ExecutionEnvironment';

@@ -56,14 +55,7 @@ import {

55 } from 'legacy-events/EventPropagators';

56 import ReactVersion from 'shared/ReactVersion';

57 import invariant from 'shared/invariant';

59 -import {

60 - exposeConcurrentModeAPIs,

61 - disableLegacyReactDOMAPIs,

62 - disableUnstableCreatePortal,

63 - disableUnstableRenderSubtreeIntoContainer,

64 - warnUnstableRenderSubtreeIntoContainer,

65 - isTestEnvironment,

66 -} from 'shared/ReactFeatureFlags';

58 +import {warnUnstableRenderSubtreeIntoContainer} from 'shared/ReactFeatureFlags';

60 import {

61 getInstanceFromNode,

@@ -120,104 +112,113 @@ function createPortal(

112 children: ReactNodeList,

113 container: Container,

114 key: ?string = null,

123 -) {

115 +): React$Portal {

116 invariant(

117 isValidContainer(container),

118 'Target container is not a DOM element.',

119 );

120 // TODO: pass ReactDOM portal implementation as third argument

121 + // $FlowFixMe The Flow type is opaque but there's no way to actually create it.

122 return createPortalImpl(children, container, null, key);

123 }

124

132 -const ReactDOM: Object = {

133 - createPortal,

134 -

135 - unstable_batchedUpdates: batchedUpdates,

136 -

137 - flushSync: flushSync,

138 -

139 - __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {

140 - // Keep in sync with ReactDOMUnstableNativeDependencies.js

141 - // ReactTestUtils.js, and ReactTestUtilsAct.js. This is an array for better minification.

142 - Events: [

143 - getInstanceFromNode,

144 - getNodeFromInstance,

145 - getFiberCurrentPropsFromNode,

146 - injectEventPluginsByName,

147 - eventNameDispatchConfigs,

148 - accumulateTwoPhaseDispatches,

149 - accumulateDirectDispatches,

150 - enqueueStateRestore,

151 - restoreStateIfNeeded,

152 - dispatchEvent,

153 - runEventsInBatch,

154 - flushPassiveEffects,

155 - IsThisRendererActing,

156 - ],

157 - },

158 -

159 - version: ReactVersion,

160 -};

161 -

162 -if (!disableLegacyReactDOMAPIs) {

163 - ReactDOM.findDOMNode = findDOMNode;

164 - ReactDOM.hydrate = hydrate;

165 - ReactDOM.render = render;

166 - ReactDOM.unmountComponentAtNode = unmountComponentAtNode;

125 +function scheduleHydration(target: Node) {

126 + if (target) {

127 + queueExplicitHydrationTarget(target);

128 + }

129 }

130

169 -if (exposeConcurrentModeAPIs) {

170 - ReactDOM.createRoot = createRoot;

171 - ReactDOM.createBlockingRoot = createBlockingRoot;

172 -

173 - ReactDOM.unstable_discreteUpdates = discreteUpdates;

174 - ReactDOM.unstable_flushDiscreteUpdates = flushDiscreteUpdates;

175 - ReactDOM.unstable_flushControlled = flushControlled;

176 -

177 - ReactDOM.unstable_scheduleHydration = target => {

178 - if (target) {

179 - queueExplicitHydrationTarget(target);

131 +function renderSubtreeIntoContainer(

132 + parentComponent: React$Component<any, any>,

133 + element: React$Element<any>,

134 + containerNode: Container,

135 + callback: ?Function,

136 +) {

137 + if (__DEV__) {

138 + if (

139 + warnUnstableRenderSubtreeIntoContainer &&

140 + !didWarnAboutUnstableRenderSubtreeIntoContainer

141 + ) {

142 + didWarnAboutUnstableRenderSubtreeIntoContainer = true;

143 + console.warn(

144 + 'ReactDOM.unstable_renderSubtreeIntoContainer() is deprecated ' +

145 + 'and will be removed in a future major release. Consider using ' +

146 + 'React Portals instead.',

147 + );

148 }

181 - };

149 + }

150 + return unstable_renderSubtreeIntoContainer(

151 + parentComponent,

152 + element,

153 + containerNode,

154 + callback,

155 + );

156 }

157

184 -if (!disableUnstableRenderSubtreeIntoContainer) {

185 - ReactDOM.unstable_renderSubtreeIntoContainer = function(...args) {

186 - if (__DEV__) {

187 - if (

188 - warnUnstableRenderSubtreeIntoContainer &&

189 - !didWarnAboutUnstableRenderSubtreeIntoContainer

190 - ) {

191 - didWarnAboutUnstableRenderSubtreeIntoContainer = true;

192 - console.warn(

193 - 'ReactDOM.unstable_renderSubtreeIntoContainer() is deprecated ' +

194 - 'and will be removed in a future major release. Consider using ' +

195 - 'React Portals instead.',

196 - );

197 - }

158 +function unstable_createPortal(

159 + children: ReactNodeList,

160 + container: Container,

161 + key: ?string = null,

162 +) {

163 + if (__DEV__) {

164 + if (!didWarnAboutUnstableCreatePortal) {

165 + didWarnAboutUnstableCreatePortal = true;

166 + console.warn(

167 + 'The ReactDOM.unstable_createPortal() alias has been deprecated, ' +

168 + 'and will be removed in React 17+. Update your code to use ' +

169 + 'ReactDOM.createPortal() instead. It has the exact same API, ' +

170 + 'but without the "unstable_" prefix.',

171 + );

172 }

199 - return unstable_renderSubtreeIntoContainer(...args);

200 - };

173 + }

174 + return createPortal(children, container, key);

175 }

176

203 -if (!disableUnstableCreatePortal) {

177 +const Internals = {

178 + // Keep in sync with ReactDOMUnstableNativeDependencies.js

179 + // ReactTestUtils.js, and ReactTestUtilsAct.js. This is an array for better minification.

180 + Events: [

181 + getInstanceFromNode,

182 + getNodeFromInstance,

183 + getFiberCurrentPropsFromNode,

184 + injectEventPluginsByName,

185 + eventNameDispatchConfigs,

186 + accumulateTwoPhaseDispatches,

187 + accumulateDirectDispatches,

188 + enqueueStateRestore,

189 + restoreStateIfNeeded,

190 + dispatchEvent,

191 + runEventsInBatch,

192 + flushPassiveEffects,

193 + IsThisRendererActing,

194 + ],

195 +};

196 +

197 +export {

198 + createPortal,

199 + batchedUpdates as unstable_batchedUpdates,

200 + flushSync,

201 + Internals as __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

202 + ReactVersion as version,

203 + // Disabled behind disableLegacyReactDOMAPIs

204 + findDOMNode,

205 + hydrate,

206 + render,

207 + unmountComponentAtNode,

208 + // exposeConcurrentModeAPIs

209 + createRoot,

210 + createBlockingRoot,

211 + discreteUpdates as unstable_discreteUpdates,

212 + flushDiscreteUpdates as unstable_flushDiscreteUpdates,

213 + flushControlled as unstable_flushControlled,

214 + scheduleHydration as unstable_scheduleHydration,

215 + // Disabled behind disableUnstableRenderSubtreeIntoContainer

216 + renderSubtreeIntoContainer as unstable_renderSubtreeIntoContainer,

217 + // Disabled behind disableUnstableCreatePortal

218 // Temporary alias since we already shipped React 16 RC with it.

219 // TODO: remove in React 17.

206 - ReactDOM.unstable_createPortal = function(...args) {

207 - if (__DEV__) {

208 - if (!didWarnAboutUnstableCreatePortal) {

209 - didWarnAboutUnstableCreatePortal = true;

210 - console.warn(

211 - 'The ReactDOM.unstable_createPortal() alias has been deprecated, ' +

212 - 'and will be removed in React 17+. Update your code to use ' +

213 - 'ReactDOM.createPortal() instead. It has the exact same API, ' +

214 - 'but without the "unstable_" prefix.',

215 - );

216 - }

217 - }

218 - return createPortal(...args);

219 - };

220 -}

220 + unstable_createPortal,

221 +};

222

223 const foundDevTools = injectIntoDevTools({

224 findFiberByHostInstance: getClosestInstanceFromNode,

@@ -252,9 +253,3 @@ if (__DEV__) {

253 }

254 }

255 }

255 -

256 -if (isTestEnvironment) {

257 - ReactDOM.act = act;

258 -}

259 -

260 -export default ReactDOM;

packages/react-dom/src/client/ReactDOMFB.js deleted

-36

@@ -1,36 +0,0 @@

1 -/**

2 - * Copyright (c) Facebook, Inc. and its affiliates.

3 - *

4 - * This source code is licensed under the MIT license found in the

5 - * LICENSE file in the root directory of this source tree.

6 - *

7 - * @flow

8 - */

9 -

10 -import {addUserTimingListener} from 'shared/ReactFeatureFlags';

11 -

12 -import ReactDOM from './ReactDOM';

13 -import {isEnabled} from '../events/ReactDOMEventListener';

14 -import {getClosestInstanceFromNode} from './ReactDOMComponentTree';

15 -

16 -if (__EXPERIMENTAL__) {

17 - // This is a modern WWW build.

18 - // It should be the same as open source. Don't add new things here.

19 -} else {

20 - // For classic WWW builds, include a few internals that are already in use.

21 - Object.assign(

22 - (ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: any),

23 - {

24 - ReactBrowserEventEmitter: {

25 - isEnabled,

26 - },

27 - ReactDOMComponentTree: {

28 - getClosestInstanceFromNode,

29 - },

30 - // Perf experiment

31 - addUserTimingListener,

32 - },

33 - );

34 -}

35 -

36 -export default ReactDOM;

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

+2 -2

@@ -101,8 +101,8 @@ export type EventTargetChildElement = {

101 ...

102 };

103 export type Container =

104 - | (Element & {_reactRootContainer: ?RootType, ...})

105 - | (Document & {_reactRootContainer: ?RootType, ...});

104 + | (Element & {_reactRootContainer?: RootType, ...})

105 + | (Document & {_reactRootContainer?: RootType, ...});

106 export type Instance = Element;

107 export type TextInstance = Text;

108 export type SuspenseInstance = Comment & {_reactRetry?: () => void, ...};

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

@@ -370,6 +370,7 @@ export function unmountComponentAtNode(container: Container) {

370 // Unmount should not be batched.

371 unbatchedUpdates(() => {

372 legacyRenderSubtreeIntoContainer(null, null, container, false, () => {

373 + // $FlowFixMe This should probably use `delete container._reactRootContainer`

374 container._reactRootContainer = null;

375 unmarkContainerAsRoot(container);

376 });

packages/react-dom/src/events/__tests__/DeprecatedDOMEventResponderSystem-test.internal.js

@@ -66,6 +66,11 @@ function dispatchClickEvent(element) {

66 describe('DOMEventResponderSystem', () => {

67 let container;

69 + if (!__EXPERIMENTAL__) {

70 + it("empty test so Jest doesn't complain", () => {});

71 + return;

72 + }

73 +

74 beforeEach(() => {

75 jest.resetModules();

76 ReactFeatureFlags = require('shared/ReactFeatureFlags');

packages/react-dom/testing.classic.fb.js new

+11

@@ -0,0 +1,11 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export * from './index.classic.fb.js';

11 +export {act} from 'react-reconciler/inline.dom';

packages/react-dom/testing.experimental.js new

+11

@@ -0,0 +1,11 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export * from './index.experimental.js';

11 +export {act} from 'react-reconciler/inline.dom';

packages/react-dom/testing.js

+2 -7

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

7 * @flow

8 */

10 -'use strict';

11 -

12 -const ReactDOM = require('./src/client/ReactDOM');

13 -

14 -// TODO: decide on the top-level export form.

15 -// This is hacky but makes it work with both Rollup and Jest.

16 -module.exports = ReactDOM.default || ReactDOM;

10 +export * from './index.js';

11 +export {act} from 'react-reconciler/inline.dom';

packages/react-dom/testing.modern.fb.js new

+11

@@ -0,0 +1,11 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export * from './index.modern.fb.js';

11 +export {act} from 'react-reconciler/inline.dom';

packages/react-dom/testing.stable.js new

+11

@@ -0,0 +1,11 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export * from './index.stable.js';

11 +export {act} from 'react-reconciler/inline.dom';

packages/react-interactions/events/src/dom/__tests__/ContextMenu-test.internal.js

@@ -38,6 +38,11 @@ const table = [[forcePointerEvents], [!forcePointerEvents]];

38 describe.each(table)('ContextMenu responder', hasPointerEvents => {

39 let container;

41 + if (!__EXPERIMENTAL__) {

42 + it("empty test so Jest doesn't complain", () => {});

43 + return;

44 + }

45 +

46 beforeEach(() => {

47 initializeModules(hasPointerEvents);

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

packages/react-interactions/events/src/dom/__tests__/Focus-test.internal.js

@@ -38,6 +38,11 @@ const table = [[forcePointerEvents], [!forcePointerEvents]];

38 describe.each(table)('Focus responder', hasPointerEvents => {

39 let container;

41 + if (!__EXPERIMENTAL__) {

42 + it("empty test so Jest doesn't complain", () => {});

43 + return;

44 + }

45 +

46 beforeEach(() => {

47 initializeModules(hasPointerEvents);

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

packages/react-interactions/events/src/dom/__tests__/FocusWithin-test.internal.js

@@ -37,6 +37,11 @@ const table = [[forcePointerEvents], [!forcePointerEvents]];

37 describe.each(table)('FocusWithin responder', hasPointerEvents => {

38 let container;

40 + if (!__EXPERIMENTAL__) {

41 + it("empty test so Jest doesn't complain", () => {});

42 + return;

43 + }

44 +

45 beforeEach(() => {

46 initializeModules();

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

packages/react-interactions/events/src/dom/__tests__/Hover-test.internal.js

@@ -34,6 +34,11 @@ const table = [[forcePointerEvents], [!forcePointerEvents]];

34 describe.each(table)('Hover responder', hasPointerEvents => {

35 let container;

37 + if (!__EXPERIMENTAL__) {

38 + it("empty test so Jest doesn't complain", () => {});

39 + return;

40 + }

41 +

42 beforeEach(() => {

43 initializeModules(hasPointerEvents);

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

packages/react-interactions/events/src/dom/__tests__/Input-test.internal.js

@@ -45,6 +45,11 @@ const modulesInit = () => {

45 describe('Input event responder', () => {

46 let container;

48 + if (!__EXPERIMENTAL__) {

49 + it("empty test so Jest doesn't complain", () => {});

50 + return;

51 + }

52 +

53 beforeEach(() => {

54 jest.resetModules();

55 modulesInit();

packages/react-interactions/events/src/dom/__tests__/Keyboard-test.internal.js

@@ -28,6 +28,11 @@ function initializeModules(hasPointerEvents) {

28 describe('Keyboard responder', () => {

29 let container;

31 + if (!__EXPERIMENTAL__) {

32 + it("empty test so Jest doesn't complain", () => {});

33 + return;

34 + }

35 +

36 beforeEach(() => {

37 initializeModules();

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

packages/react-interactions/events/src/dom/__tests__/MixedResponders-test-internal.js

@@ -19,6 +19,11 @@ let Scheduler;

19 describe('mixing responders with the heritage event system', () => {

20 let container;

22 + if (!__EXPERIMENTAL__) {

23 + it("empty test so Jest doesn't complain", () => {});

24 + return;

25 + }

26 +

27 beforeEach(() => {

28 ReactFeatureFlags = require('shared/ReactFeatureFlags');

29 ReactFeatureFlags.enableDeprecatedFlareAPI = true;

packages/react-interactions/events/src/dom/__tests__/Press-test.internal.js

@@ -38,6 +38,11 @@ const pointerTypesTable = [['mouse'], ['touch']];

38 describeWithPointerEvent('Press responder', hasPointerEvents => {

39 let container;

41 + if (!__EXPERIMENTAL__) {

42 + it("empty test so Jest doesn't complain", () => {});

43 + return;

44 + }

45 +

46 beforeEach(() => {

47 initializeModules(hasPointerEvents);

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

packages/react-interactions/events/src/dom/__tests__/PressLegacy-test.internal.js

@@ -50,6 +50,11 @@ const pointerTypesTable = [['mouse'], ['touch']];

50 describe.each(environmentTable)('Press responder', hasPointerEvents => {

51 let container;

53 + if (!__EXPERIMENTAL__) {

54 + it("empty test so Jest doesn't complain", () => {});

55 + return;

56 + }

57 +

58 beforeEach(() => {

59 initializeModules(hasPointerEvents);

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

packages/react-interactions/events/src/dom/__tests__/Tap-test.internal.js

@@ -73,6 +73,11 @@ function tapAndReleaseOutside({

73 describeWithPointerEvent('Tap responder', hasPointerEvents => {

74 let container;

76 + if (!__EXPERIMENTAL__) {

77 + it("empty test so Jest doesn't complain", () => {});

78 + return;

79 + }

80 +

81 beforeEach(() => {

82 initializeModules(hasPointerEvents);

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

packages/react-is/src/__tests__/ReactIs-test.js

+1 -3

@@ -13,8 +13,6 @@ let React;

13 let ReactDOM;

14 let ReactIs;

16 -const ReactFeatureFlags = require('shared/ReactFeatureFlags');

17 -

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

17 beforeEach(() => {

18 jest.resetModules();

@@ -56,7 +54,7 @@ describe('ReactIs', () => {

54 expect(ReactIs.isValidElementType(MemoComponent)).toEqual(true);

55 expect(ReactIs.isValidElementType(Context.Provider)).toEqual(true);

56 expect(ReactIs.isValidElementType(Context.Consumer)).toEqual(true);

59 - if (!ReactFeatureFlags.disableCreateFactory) {

57 + if (!__EXPERIMENTAL__) {

58 let factory;

59 expect(() => {

60 factory = React.createFactory('div');

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

+2 -1

@@ -9,6 +9,7 @@

10 import type {ReactFabricType, HostComponent} from './ReactNativeTypes';

11 import type {ReactNodeList} from 'shared/ReactTypes';

12 +import type {ElementRef} from 'react';

14 import './ReactFabricInjection';

@@ -43,7 +44,7 @@ const ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;

45 function findHostInstance_DEPRECATED(

46 componentOrHandle: any,

46 -): ?React$ElementRef<HostComponent<mixed>> {

47 +): ?ElementRef<HostComponent<mixed>> {

48 if (__DEV__) {

49 const owner = ReactCurrentOwner.current;

50 if (owner !== null && owner.stateNode !== null) {

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

+3 -1

@@ -7,7 +7,9 @@

7 * @flow

8 */

10 +import type {ElementRef} from 'react';

11 import type {

12 + HostComponent,

13 MeasureInWindowOnSuccessCallback,

14 MeasureLayoutOnSuccessCallback,

15 MeasureOnSuccessCallback,

@@ -126,7 +128,7 @@ class ReactFabricHostComponent {

128 }

129

130 measureLayout(

129 - relativeToNativeNode: number | ReactFabricHostComponent,

131 + relativeToNativeNode: number | ElementRef<HostComponent<mixed>>,

132 onSuccess: MeasureLayoutOnSuccessCallback,

133 onFail?: () => void /* currently unused */,

134 ) {

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

+8 -3

@@ -7,7 +7,9 @@

7 * @flow

8 */

10 +import type {ElementRef} from 'react';

11 import type {

12 + HostComponent,

13 MeasureInWindowOnSuccessCallback,

14 MeasureLayoutOnSuccessCallback,

15 MeasureOnSuccessCallback,

@@ -62,7 +64,7 @@ class ReactNativeFiberHostComponent {

64 }

66 measureLayout(

65 - relativeToNativeNode: number | ReactNativeFiberHostComponent,

67 + relativeToNativeNode: number | ElementRef<HostComponent<mixed>>,

68 onSuccess: MeasureLayoutOnSuccessCallback,

69 onFail?: () => void /* currently unused */,

70 ) {

@@ -71,8 +73,11 @@ class ReactNativeFiberHostComponent {

73 if (typeof relativeToNativeNode === 'number') {

74 // Already a node handle

75 relativeNode = relativeToNativeNode;

74 - } else if (relativeToNativeNode._nativeTag) {

75 - relativeNode = relativeToNativeNode._nativeTag;

76 + } else {

77 + let nativeNode: ReactNativeFiberHostComponent = (relativeToNativeNode: any);

78 + if (nativeNode._nativeTag) {

79 + relativeNode = nativeNode._nativeTag;

80 + }

81 }

83 if (relativeNode == null) {

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

+1 -8

@@ -7,8 +7,6 @@

7 * @flow

8 */

10 -import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes';

11 -

10 import invariant from 'shared/invariant';

12 // Modules provided by RN:

@@ -31,12 +29,7 @@ const {get: getViewConfigForType} = ReactNativeViewConfigRegistry;

29 export type Type = string;

30 export type Props = Object;

31 export type Container = number;

34 -export type Instance = {

35 - _children: Array<Instance | number>,

36 - _nativeTag: number,

37 - viewConfig: ReactNativeBaseComponentViewConfig<>,

38 - ...

39 -};

32 +export type Instance = ReactNativeFiberHostComponent;

33 export type TextInstance = number;

34 export type HydratableInstance = Instance | TextInstance;

35 export type PublicInstance = Instance;

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

+3 -1

@@ -126,7 +126,9 @@ export type ReactNativeType = {

126 };

127

128 export type ReactFabricType = {

129 - findHostInstance_DEPRECATED(componentOrHandle: any): ?HostComponent<mixed>,

129 + findHostInstance_DEPRECATED(

130 + componentOrHandle: any,

131 + ): ?ElementRef<HostComponent<mixed>>,

132 findNodeHandle(componentOrHandle: any): ?number,

133 dispatchCommand(handle: any, command: string, args: Array<any>): void,

134 render(

packages/react-reconciler/src/__tests__/ReactFiberFundamental-test.internal.js

@@ -50,6 +50,11 @@ function initReactDOMServer() {

50 }

52 describe('ReactFiberFundamental', () => {

53 + if (!__EXPERIMENTAL__) {

54 + it("empty test so Jest doesn't complain", () => {});

55 + return;

56 + }

57 +

58 describe('NoopRenderer', () => {

59 beforeEach(() => {

60 initNoopRenderer();

packages/react-reconciler/src/__tests__/ReactScope-test.internal.js

@@ -23,6 +23,11 @@ describe('ReactScope', () => {

23 React = require('react');

24 });

26 + if (!__EXPERIMENTAL__) {

27 + it("empty test so Jest doesn't complain", () => {});

28 + return;

29 + }

30 +

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

32 let ReactDOM;

33 let container;

packages/react/index.classic.fb.js new

+55

@@ -0,0 +1,55 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export {

11 + Children,

12 + createRef,

13 + Component,

14 + PureComponent,

15 + createContext,

16 + forwardRef,

17 + lazy,

18 + memo,

19 + useCallback,

20 + useContext,

21 + useEffect,

22 + useImperativeHandle,

23 + useDebugValue,

24 + useLayoutEffect,

25 + useMemo,

26 + useReducer,

27 + useRef,

28 + useState,

29 + Fragment,

30 + Profiler,

31 + StrictMode,

32 + Suspense,

33 + createElement,

34 + cloneElement,

35 + isValidElement,

36 + version,

37 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

38 + createFactory,

39 + // exposeConcurrentModeAPIs

40 + useTransition,

41 + useDeferredValue,

42 + SuspenseList,

43 + unstable_withSuspenseConfig,

44 + // enableBlocksAPI

45 + block,

46 + // enableDeprecatedFlareAPI

47 + DEPRECATED_useResponder,

48 + DEPRECATED_createResponder,

49 + // enableScopeAPI

50 + unstable_createScope,

51 + // enableJSXTransformAPI

52 + jsx,

53 + jsxs,

54 + jsxDEV,

55 +} from './src/React';

packages/react/index.experimental.js new

+46

@@ -0,0 +1,46 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export {

11 + Children,

12 + createRef,

13 + Component,

14 + PureComponent,

15 + createContext,

16 + forwardRef,

17 + lazy,

18 + memo,

19 + useCallback,

20 + useContext,

21 + useEffect,

22 + useImperativeHandle,

23 + useDebugValue,

24 + useLayoutEffect,

25 + useMemo,

26 + useReducer,

27 + useRef,

28 + useState,

29 + Fragment,

30 + Profiler,

31 + StrictMode,

32 + Suspense,

33 + createElement,

34 + cloneElement,

35 + isValidElement,

36 + version,

37 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

38 + createFactory,

39 + // exposeConcurrentModeAPIs

40 + useTransition,

41 + useDeferredValue,

42 + SuspenseList,

43 + unstable_withSuspenseConfig,

44 + // enableBlocksAPI

45 + block,

46 +} from './src/React';

packages/react/index.js

+70 -6

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

7 * @flow

8 */

10 -'use strict';

10 +// Keep in sync with https://github.com/facebook/flow/blob/master/lib/react.js

11 +export type StatelessFunctionalComponent<

12 + P,

13 +> = React$StatelessFunctionalComponent<P>;

14 +export type ComponentType<-P> = React$ComponentType<P>;

15 +export type AbstractComponent<

16 + -Config,

17 + +Instance = mixed,

18 +> = React$AbstractComponent<Config, Instance>;

19 +export type ElementType = React$ElementType;

20 +export type Element<+C> = React$Element<C>;

21 +export type Key = React$Key;

22 +export type Ref<C> = React$Ref<C>;

23 +export type Node = React$Node;

24 +export type Context<T> = React$Context<T>;

25 +export type Portal = React$Portal;

26 +export type ElementProps<C> = React$ElementProps<C>;

27 +export type ElementConfig<C> = React$ElementConfig<C>;

28 +export type ElementRef<C> = React$ElementRef<C>;

29 +export type Config<Props, DefaultProps> = React$Config<Props, DefaultProps>;

30 +export type ChildrenArray<+T> = $ReadOnlyArray<ChildrenArray<T>> | T;

31 +export type Interaction = {

32 + name: string,

33 + timestamp: number,

34 + ...

35 +};

12 -const React = require('./src/React');

13 -

14 -// TODO: decide on the top-level export form.

15 -// This is hacky but makes it work with both Rollup and Jest.

16 -module.exports = React.default || React;

37 +// Export all exports so that they're available in tests.

38 +// We can't use export * from in Flow for some reason.

39 +export {

40 + Children,

41 + createRef,

42 + Component,

43 + PureComponent,

44 + createContext,

45 + forwardRef,

46 + lazy,

47 + memo,

48 + useCallback,

49 + useContext,

50 + useEffect,

51 + useImperativeHandle,

52 + useDebugValue,

53 + useLayoutEffect,

54 + useMemo,

55 + useReducer,

56 + useRef,

57 + useState,

58 + Fragment,

59 + Profiler,

60 + StrictMode,

61 + Suspense,

62 + createElement,

63 + cloneElement,

64 + isValidElement,

65 + version,

66 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

67 + createFactory,

68 + useTransition,

69 + useDeferredValue,

70 + SuspenseList,

71 + unstable_withSuspenseConfig,

72 + block,

73 + DEPRECATED_useResponder,

74 + DEPRECATED_createResponder,

75 + unstable_createFundamental,

76 + unstable_createScope,

77 + jsx,

78 + jsxs,

79 + jsxDEV,

80 +} from './src/React';

packages/react/index.modern.fb.js new

+54

@@ -0,0 +1,54 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export {

11 + Children,

12 + createRef,

13 + Component,

14 + PureComponent,

15 + createContext,

16 + forwardRef,

17 + lazy,

18 + memo,

19 + useCallback,

20 + useContext,

21 + useEffect,

22 + useImperativeHandle,

23 + useDebugValue,

24 + useLayoutEffect,

25 + useMemo,

26 + useReducer,

27 + useRef,

28 + useState,

29 + Fragment,

30 + Profiler,

31 + StrictMode,

32 + Suspense,

33 + createElement,

34 + cloneElement,

35 + isValidElement,

36 + version,

37 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

38 + // exposeConcurrentModeAPIs

39 + useTransition,

40 + useDeferredValue,

41 + SuspenseList,

42 + unstable_withSuspenseConfig,

43 + // enableBlocksAPI

44 + block,

45 + // enableDeprecatedFlareAPI

46 + DEPRECATED_useResponder,

47 + DEPRECATED_createResponder,

48 + // enableScopeAPI

49 + unstable_createScope,

50 + // enableJSXTransformAPI

51 + jsx,

52 + jsxs,

53 + jsxDEV,

54 +} from './src/React';

packages/react/index.stable.js new

+39

@@ -0,0 +1,39 @@

1 +/**

2 + * Copyright (c) Facebook, Inc. and its affiliates.

3 + *

4 + * This source code is licensed under the MIT license found in the

5 + * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 + */

9 +

10 +export {

11 + Children,

12 + createRef,

13 + Component,

14 + PureComponent,

15 + createContext,

16 + forwardRef,

17 + lazy,

18 + memo,

19 + useCallback,

20 + useContext,

21 + useEffect,

22 + useImperativeHandle,

23 + useDebugValue,

24 + useLayoutEffect,

25 + useMemo,

26 + useReducer,

27 + useRef,

28 + useState,

29 + Fragment,

30 + Profiler,

31 + StrictMode,

32 + Suspense,

33 + createElement,

34 + cloneElement,

35 + isValidElement,

36 + version,

37 + __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

38 + createFactory,

39 +} from './src/React';

packages/react/src/React.js

+55 -84

@@ -18,11 +18,11 @@ import {Component, PureComponent} from './ReactBaseClasses';

18 import {createRef} from './ReactCreateRef';

19 import {forEach, map, count, toArray, only} from './ReactChildren';

20 import {

21 - createElement,

22 - createFactory,

23 - cloneElement,

21 + createElement as createElementProd,

22 + createFactory as createFactoryProd,

23 + cloneElement as cloneElementProd,

24 isValidElement,

25 - jsx,

25 + jsx as jsxProd,

26 } from './ReactElement';

27 import {createContext} from './ReactContext';

28 import {lazy} from './ReactLazy';

@@ -57,33 +57,35 @@ import ReactSharedInternals from './ReactSharedInternals';

57 import createFundamental from 'shared/createFundamentalComponent';

58 import createResponder from 'shared/createEventResponder';

59 import createScope from 'shared/createScope';

60 -import {

61 - enableJSXTransformAPI,

62 - enableDeprecatedFlareAPI,

63 - enableFundamentalAPI,

64 - enableScopeAPI,

65 - exposeConcurrentModeAPIs,

66 - enableBlocksAPI,

67 - disableCreateFactory,

68 -} from 'shared/ReactFeatureFlags';

69 -const React = {

70 - Children: {

71 - map,

72 - forEach,

73 - count,

74 - toArray,

75 - only,

76 - },

61 +// TODO: Move this branching into the other module instead and just re-export.

62 +const createElement = __DEV__ ? createElementWithValidation : createElementProd;

63 +const cloneElement = __DEV__ ? cloneElementWithValidation : cloneElementProd;

64 +const createFactory = __DEV__ ? createFactoryWithValidation : createFactoryProd;

65 +

66 +const jsxDEV = __DEV__ ? jsxWithValidation : undefined;

67 +const jsx = __DEV__ ? jsxWithValidationDynamic : jsxProd;

68 +// we may want to special case jsxs internally to take advantage of static children.

69 +// for now we can ship identical prod functions

70 +const jsxs = __DEV__ ? jsxWithValidationStatic : jsxProd;

71 +

72 +const Children = {

73 + map,

74 + forEach,

75 + count,

76 + toArray,

77 + only,

78 +};

79 +

80 +export {

81 + Children,

82 createRef,

83 Component,

84 PureComponent,

81 -

85 createContext,

86 forwardRef,

87 lazy,

88 memo,

86 -

89 useCallback,

90 useContext,

91 useEffect,

@@ -94,65 +96,34 @@ const React = {

96 useReducer,

97 useRef,

98 useState,

97 -

98 - Fragment: REACT_FRAGMENT_TYPE,

99 - Profiler: REACT_PROFILER_TYPE,

100 - StrictMode: REACT_STRICT_MODE_TYPE,

101 - Suspense: REACT_SUSPENSE_TYPE,

102 -

103 - createElement: __DEV__ ? createElementWithValidation : createElement,

104 - cloneElement: __DEV__ ? cloneElementWithValidation : cloneElement,

105 - isValidElement: isValidElement,

106 -

107 - version: ReactVersion,

108 -

109 - __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: ReactSharedInternals,

99 + REACT_FRAGMENT_TYPE as Fragment,

100 + REACT_PROFILER_TYPE as Profiler,

101 + REACT_STRICT_MODE_TYPE as StrictMode,

102 + REACT_SUSPENSE_TYPE as Suspense,

103 + createElement,

104 + cloneElement,

105 + isValidElement,

106 + ReactVersion as version,

107 + ReactSharedInternals as __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,

108 + // Deprecated behind disableCreateFactory

109 + createFactory,

110 + // Concurrent Mode

111 + useTransition,

112 + useDeferredValue,

113 + REACT_SUSPENSE_LIST_TYPE as SuspenseList,

114 + withSuspenseConfig as unstable_withSuspenseConfig,

115 + // enableBlocksAPI

116 + block,

117 + // enableDeprecatedFlareAPI

118 + useResponder as DEPRECATED_useResponder,

119 + createResponder as DEPRECATED_createResponder,

120 + // enableFundamentalAPI

121 + createFundamental as unstable_createFundamental,

122 + // enableScopeAPI

123 + createScope as unstable_createScope,

124 + // enableJSXTransformAPI

125 + jsx,

126 + jsxs,

127 + // TODO: jsxDEV should not be exposed as a name. We might want to move it to a different entry point.

128 + jsxDEV,

129 };

111 -

112 -if (!disableCreateFactory) {

113 - React.createFactory = __DEV__ ? createFactoryWithValidation : createFactory;

114 -}

115 -

116 -if (exposeConcurrentModeAPIs) {

117 - React.useTransition = useTransition;

118 - React.useDeferredValue = useDeferredValue;

119 - React.SuspenseList = REACT_SUSPENSE_LIST_TYPE;

120 - React.unstable_withSuspenseConfig = withSuspenseConfig;

121 -}

122 -

123 -if (enableBlocksAPI) {

124 - React.block = block;

125 -}

126 -

127 -if (enableDeprecatedFlareAPI) {

128 - React.DEPRECATED_useResponder = useResponder;

129 - React.DEPRECATED_createResponder = createResponder;

130 -}

131 -

132 -if (enableFundamentalAPI) {

133 - React.unstable_createFundamental = createFundamental;

134 -}

135 -

136 -if (enableScopeAPI) {

137 - React.unstable_createScope = createScope;

138 -}

139 -

140 -// Note: some APIs are added with feature flags.

141 -// Make sure that stable builds for open source

142 -// don't modify the React object to avoid deopts.

143 -// Also let's not expose their names in stable builds.

144 -

145 -if (enableJSXTransformAPI) {

146 - if (__DEV__) {

147 - React.jsxDEV = jsxWithValidation;

148 - React.jsx = jsxWithValidationDynamic;

149 - React.jsxs = jsxWithValidationStatic;

150 - } else {

151 - React.jsx = jsx;

152 - // we may want to special case jsxs internally to take advantage of static children.

153 - // for now we can ship identical prod functions

154 - React.jsxs = jsx;

155 - }

156 -}

157 -

158 -export default React;

packages/react/src/__tests__/ReactElement-test.js

+2 -4

@@ -13,8 +13,6 @@ let React;

13 let ReactDOM;

14 let ReactTestUtils;

16 -const ReactFeatureFlags = require('shared/ReactFeatureFlags');

17 -

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

17 let ComponentClass;

18 let originalSymbol;

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

310 expect(React.isValidElement(true)).toEqual(false);

311 expect(React.isValidElement({})).toEqual(false);

312 expect(React.isValidElement('string')).toEqual(false);

315 - if (!ReactFeatureFlags.disableCreateFactory) {

313 + if (!__EXPERIMENTAL__) {

314 let factory;

315 expect(() => {

316 factory = React.createFactory('div');

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

479 expect(React.isValidElement(true)).toEqual(false);

480 expect(React.isValidElement({})).toEqual(false);

481 expect(React.isValidElement('string')).toEqual(false);

484 - if (!ReactFeatureFlags.disableCreateFactory) {

482 + if (!__EXPERIMENTAL__) {

483 let factory;

484 expect(() => {

485 factory = React.createFactory('div');

packages/react/src/__tests__/ReactElementJSX-test.internal.js

+7 -6

@@ -31,7 +31,6 @@ describe('ReactElement.jsx', () => {

31 global.Symbol = undefined;

33 ReactFeatureFlags = require('shared/ReactFeatureFlags');

34 - ReactFeatureFlags.enableJSXTransformAPI = true;

34 ReactFeatureFlags.warnAboutSpreadingKeyToJSX = true;

36 React = require('react');

@@ -43,6 +42,11 @@ describe('ReactElement.jsx', () => {

42 global.Symbol = originalSymbol;

43 });

45 + if (!__EXPERIMENTAL__) {

46 + it("empty test so Jest doesn't complain", () => {});

47 + return;

48 + }

49 +

50 it('allows static methods to be called using the type property', () => {

51 class StaticMethodComponentClass extends React.Component {

52 render() {

@@ -69,7 +73,7 @@ describe('ReactElement.jsx', () => {

73 expect(React.isValidElement(true)).toEqual(false);

74 expect(React.isValidElement({})).toEqual(false);

75 expect(React.isValidElement('string')).toEqual(false);

72 - if (!ReactFeatureFlags.disableCreateFactory) {

76 + if (!__EXPERIMENTAL__) {

77 let factory;

78 expect(() => {

79 factory = React.createFactory('div');

@@ -292,9 +296,6 @@ describe('ReactElement.jsx', () => {

296

297 jest.resetModules();

298

295 - ReactFeatureFlags = require('shared/ReactFeatureFlags');

296 - ReactFeatureFlags.enableJSXTransformAPI = true;

297 -

299 React = require('react');

300

301 class Component extends React.Component {

@@ -310,7 +311,7 @@ describe('ReactElement.jsx', () => {

311 expect(React.isValidElement(true)).toEqual(false);

312 expect(React.isValidElement({})).toEqual(false);

313 expect(React.isValidElement('string')).toEqual(false);

313 - if (!ReactFeatureFlags.disableCreateFactory) {

314 + if (!__EXPERIMENTAL__) {

315 let factory;

316 expect(() => {

317 factory = React.createFactory('div');

packages/react/src/__tests__/ReactElementValidator-test.internal.js

+1 -1

@@ -439,7 +439,7 @@ describe('ReactElementValidator', () => {

439 );

440 });

441

442 - if (!ReactFeatureFlags.disableCreateFactory) {

442 + if (!__EXPERIMENTAL__) {

443 it('should warn when accessing .type on an element factory', () => {

444 function TestComponent() {

445 return <div />;

packages/shared/ReactFeatureFlags.js

-20

@@ -44,10 +44,6 @@ export function addUserTimingListener() {

44 // Disable javascript: URL strings in href for XSS protection.

45 export const disableJavaScriptURLs = false;

47 -// These APIs will no longer be "unstable" in the upcoming 16.7 release,

48 -// Control this behavior with a flag to support 16.6 minor releases in the meanwhile.

49 -export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;

50 -

47 // Warns when a combination of updates on a dom can cause a style declaration

48 // that clashes with a previous one https://github.com/facebook/react/pull/14181

49 export const warnAboutShorthandPropertyCollision = true;

@@ -62,7 +58,6 @@ export const enableFundamentalAPI = false;

58 export const enableScopeAPI = false;

60 // New API for JSX transforms to target - https://github.com/reactjs/rfcs/pull/107

65 -export const enableJSXTransformAPI = false;

62 // We will enforce mocking scheduler with scheduler/unstable_mock at some point. (v17?)

63 // Till then, we warn about the missing mock, but still fallback to a legacy mode compatible version

@@ -108,10 +103,6 @@ export const runAllPassiveEffectDestroysBeforeCreates = false;

103 // WARNING This flag only has an affect if used with runAllPassiveEffectDestroysBeforeCreates.

104 export const deferPassiveEffectCleanupDuringUnmount = false;

105

111 -// Use this flag to generate "testing" builds, that include APIs like act()

112 -// and extra warnings/errors

113 -export const isTestEnvironment = false;

114 -

106 // Enables a warning when trying to spread a 'key' to an element;

107 // a deprecated pattern we want to get rid of in the future

108 export const warnAboutSpreadingKeyToJSX = false;

@@ -128,25 +119,14 @@ export const warnAboutStringRefs = false;

119

120 export const disableLegacyContext = false;

121

131 -// Disables React.createFactory

132 -export const disableCreateFactory = false;

133 -

134 -// Disables hydrate, render, findDOMNode, unmountComponentAtNode

135 -export const disableLegacyReactDOMAPIs = false;

136 -

122 // Disables children for <textarea> elements

123 export const disableTextareaChildren = false;

124

125 // Disables Maps as ReactElement children

126 export const disableMapsAsChildren = false;

127

143 -// Disables ReactDOM.unstable_renderSubtreeIntoContainer

144 -export const disableUnstableRenderSubtreeIntoContainer = false;

128 // We should remove this flag once the above flag becomes enabled

129 export const warnUnstableRenderSubtreeIntoContainer = false;

130

148 -// Disables ReactDOM.unstable_createPortal

149 -export const disableUnstableCreatePortal = false;

150 -

131 // Modern event system where events get registered at roots

132 export const enableModernEventSystem = false;

packages/shared/ReactSharedInternals.js

@@ -3,6 +3,8 @@

3 *

4 * This source code is licensed under the MIT license found in the

5 * LICENSE file in the root directory of this source tree.

6 + *

7 + * @flow

8 */

10 import * as React from 'react';

packages/shared/forks/ReactFeatureFlags.native-fb.js

-7

@@ -24,7 +24,6 @@ export const enableSchedulerTracing = __PROFILE__;

24 export const enableSuspenseServerRenderer = false;

25 export const enableSelectiveHydration = false;

26 export const enableBlocksAPI = false;

27 -export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;

27 export const warnAboutShorthandPropertyCollision = true;

28 export const enableSchedulerDebugging = false;

29 export const debugRenderPhaseSideEffectsForStrictMode = true;

@@ -35,7 +34,6 @@ export const warnAboutDeprecatedLifecycles = true;

34 export const enableDeprecatedFlareAPI = false;

35 export const enableFundamentalAPI = false;

36 export const enableScopeAPI = false;

38 -export const enableJSXTransformAPI = false;

37 export const warnAboutUnmockedScheduler = true;

38 export const flushSuspenseFallbacksInTests = true;

39 export const enableSuspenseCallback = false;

@@ -45,16 +43,11 @@ export const disableLegacyContext = false;

43 export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;

44 export const enableTrainModelFix = true;

45 export const enableTrustedTypesIntegration = false;

48 -export const disableCreateFactory = false;

49 -export const disableLegacyReactDOMAPIs = false;

46 export const disableTextareaChildren = false;

47 export const disableMapsAsChildren = false;

52 -export const disableUnstableRenderSubtreeIntoContainer = false;

48 export const warnUnstableRenderSubtreeIntoContainer = false;

54 -export const disableUnstableCreatePortal = false;

49 export const deferPassiveEffectCleanupDuringUnmount = false;

50 export const runAllPassiveEffectDestroysBeforeCreates = false;

57 -export const isTestEnvironment = false;

51 export const enableModernEventSystem = false;

52 export const warnAboutSpreadingKeyToJSX = false;

packages/shared/forks/ReactFeatureFlags.native-oss.js

-7

@@ -23,13 +23,11 @@ export const enableSelectiveHydration = false;

23 export const enableBlocksAPI = false;

24 export const disableJavaScriptURLs = false;

25 export const disableInputAttributeSyncing = false;

26 -export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;

26 export const warnAboutShorthandPropertyCollision = true;

27 export const enableSchedulerDebugging = false;

28 export const enableDeprecatedFlareAPI = false;

29 export const enableFundamentalAPI = false;

30 export const enableScopeAPI = false;

32 -export const enableJSXTransformAPI = false;

31 export const warnAboutUnmockedScheduler = false;

32 export const flushSuspenseFallbacksInTests = true;

33 export const enableSuspenseCallback = false;

@@ -40,16 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;

38 export const enableTrainModelFix = true;

39 export const enableTrustedTypesIntegration = false;

40 export const enableNativeTargetAsInstance = false;

43 -export const disableCreateFactory = false;

44 -export const disableLegacyReactDOMAPIs = false;

41 export const disableTextareaChildren = false;

42 export const disableMapsAsChildren = false;

47 -export const disableUnstableRenderSubtreeIntoContainer = false;

43 export const warnUnstableRenderSubtreeIntoContainer = false;

49 -export const disableUnstableCreatePortal = false;

44 export const deferPassiveEffectCleanupDuringUnmount = false;

45 export const runAllPassiveEffectDestroysBeforeCreates = false;

52 -export const isTestEnvironment = false;

46 export const enableModernEventSystem = false;

47 export const warnAboutSpreadingKeyToJSX = false;

packages/shared/forks/ReactFeatureFlags.persistent.js

-7

@@ -23,13 +23,11 @@ export const enableSelectiveHydration = false;

23 export const enableBlocksAPI = false;

24 export const disableJavaScriptURLs = false;

25 export const disableInputAttributeSyncing = false;

26 -export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;

26 export const warnAboutShorthandPropertyCollision = true;

27 export const enableSchedulerDebugging = false;

28 export const enableDeprecatedFlareAPI = false;

29 export const enableFundamentalAPI = false;

30 export const enableScopeAPI = false;

32 -export const enableJSXTransformAPI = false;

31 export const warnAboutUnmockedScheduler = true;

32 export const flushSuspenseFallbacksInTests = true;

33 export const enableSuspenseCallback = false;

@@ -40,16 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;

38 export const enableTrainModelFix = true;

39 export const enableTrustedTypesIntegration = false;

40 export const enableNativeTargetAsInstance = false;

43 -export const disableCreateFactory = false;

44 -export const disableLegacyReactDOMAPIs = false;

41 export const disableTextareaChildren = false;

42 export const disableMapsAsChildren = false;

47 -export const disableUnstableRenderSubtreeIntoContainer = false;

43 export const warnUnstableRenderSubtreeIntoContainer = false;

49 -export const disableUnstableCreatePortal = false;

44 export const deferPassiveEffectCleanupDuringUnmount = false;

45 export const runAllPassiveEffectDestroysBeforeCreates = false;

52 -export const isTestEnvironment = false;

46 export const enableModernEventSystem = false;

47 export const warnAboutSpreadingKeyToJSX = false;

packages/shared/forks/ReactFeatureFlags.test-renderer.js

-7

@@ -23,13 +23,11 @@ export const enableSelectiveHydration = false;

23 export const enableBlocksAPI = false;

24 export const disableJavaScriptURLs = false;

25 export const disableInputAttributeSyncing = false;

26 -export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;

26 export const warnAboutShorthandPropertyCollision = true;

27 export const enableSchedulerDebugging = false;

28 export const enableDeprecatedFlareAPI = false;

29 export const enableFundamentalAPI = false;

30 export const enableScopeAPI = false;

32 -export const enableJSXTransformAPI = false;

31 export const warnAboutUnmockedScheduler = false;

32 export const flushSuspenseFallbacksInTests = true;

33 export const enableSuspenseCallback = false;

@@ -40,16 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;

38 export const enableTrainModelFix = true;

39 export const enableTrustedTypesIntegration = false;

40 export const enableNativeTargetAsInstance = false;

43 -export const disableCreateFactory = false;

44 -export const disableLegacyReactDOMAPIs = false;

41 export const disableTextareaChildren = false;

42 export const disableMapsAsChildren = false;

47 -export const disableUnstableRenderSubtreeIntoContainer = false;

43 export const warnUnstableRenderSubtreeIntoContainer = false;

49 -export const disableUnstableCreatePortal = false;

44 export const deferPassiveEffectCleanupDuringUnmount = false;

45 export const runAllPassiveEffectDestroysBeforeCreates = false;

52 -export const isTestEnvironment = true; // this should probably *never* change

46 export const enableModernEventSystem = false;

47 export const warnAboutSpreadingKeyToJSX = false;

packages/shared/forks/ReactFeatureFlags.test-renderer.www.js

-7

@@ -21,7 +21,6 @@ export const enableSchedulerTracing = __PROFILE__;

21 export const enableSuspenseServerRenderer = false;

22 export const enableSelectiveHydration = false;

23 export const enableBlocksAPI = false;

24 -export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;

24 export const warnAboutShorthandPropertyCollision = true;

25 export const enableSchedulerDebugging = false;

26 export const disableJavaScriptURLs = false;

@@ -29,7 +28,6 @@ export const disableInputAttributeSyncing = false;

28 export const enableDeprecatedFlareAPI = true;

29 export const enableFundamentalAPI = false;

30 export const enableScopeAPI = true;

32 -export const enableJSXTransformAPI = true;

31 export const warnAboutUnmockedScheduler = true;

32 export const flushSuspenseFallbacksInTests = true;

33 export const enableSuspenseCallback = true;

@@ -40,16 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;

38 export const enableTrainModelFix = true;

39 export const enableTrustedTypesIntegration = false;

40 export const enableNativeTargetAsInstance = false;

43 -export const disableCreateFactory = false;

44 -export const disableLegacyReactDOMAPIs = false;

41 export const disableTextareaChildren = false;

42 export const disableMapsAsChildren = false;

47 -export const disableUnstableRenderSubtreeIntoContainer = false;

43 export const warnUnstableRenderSubtreeIntoContainer = false;

49 -export const disableUnstableCreatePortal = false;

44 export const deferPassiveEffectCleanupDuringUnmount = false;

45 export const runAllPassiveEffectDestroysBeforeCreates = false;

52 -export const isTestEnvironment = true; // this should probably *never* change

46 export const enableModernEventSystem = false;

47 export const warnAboutSpreadingKeyToJSX = false;

packages/shared/forks/ReactFeatureFlags.testing.js

-7

@@ -23,13 +23,11 @@ export const enableSelectiveHydration = false;

23 export const enableBlocksAPI = false;

24 export const disableJavaScriptURLs = false;

25 export const disableInputAttributeSyncing = false;

26 -export const exposeConcurrentModeAPIs = __EXPERIMENTAL__;

26 export const warnAboutShorthandPropertyCollision = true;

27 export const enableSchedulerDebugging = false;

28 export const enableDeprecatedFlareAPI = false;

29 export const enableFundamentalAPI = false;

30 export const enableScopeAPI = false;

32 -export const enableJSXTransformAPI = false;

31 export const warnAboutUnmockedScheduler = false;

32 export const flushSuspenseFallbacksInTests = true;

33 export const enableSuspenseCallback = false;

@@ -40,16 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;

38 export const enableTrainModelFix = true;

39 export const enableTrustedTypesIntegration = false;

40 export const enableNativeTargetAsInstance = false;

43 -export const disableCreateFactory = false;

44 -export const disableLegacyReactDOMAPIs = false;

41 export const disableTextareaChildren = false;

42 export const disableMapsAsChildren = false;

47 -export const disableUnstableRenderSubtreeIntoContainer = false;

43 export const warnUnstableRenderSubtreeIntoContainer = false;

49 -export const disableUnstableCreatePortal = false;

44 export const deferPassiveEffectCleanupDuringUnmount = false;

45 export const runAllPassiveEffectDestroysBeforeCreates = false;

52 -export const isTestEnvironment = true;

46 export const enableModernEventSystem = false;

47 export const warnAboutSpreadingKeyToJSX = false;

packages/shared/forks/ReactFeatureFlags.testing.www.js

-7

@@ -23,13 +23,11 @@ export const enableSelectiveHydration = true;

23 export const enableBlocksAPI = true;

24 export const disableJavaScriptURLs = true;

25 export const disableInputAttributeSyncing = false;

26 -export const exposeConcurrentModeAPIs = true;

26 export const warnAboutShorthandPropertyCollision = true;

27 export const enableSchedulerDebugging = false;

28 export const enableDeprecatedFlareAPI = true;

29 export const enableFundamentalAPI = false;

30 export const enableScopeAPI = true;

32 -export const enableJSXTransformAPI = true;

31 export const warnAboutUnmockedScheduler = true;

32 export const flushSuspenseFallbacksInTests = true;

33 export const enableSuspenseCallback = true;

@@ -40,16 +38,11 @@ export const disableSchedulerTimeoutBasedOnReactExpirationTime = false;

38 export const enableTrainModelFix = true;

39 export const enableTrustedTypesIntegration = false;

40 export const enableNativeTargetAsInstance = false;

43 -export const disableCreateFactory = __EXPERIMENTAL__;

44 -export const disableLegacyReactDOMAPIs = __EXPERIMENTAL__;

41 export const disableTextareaChildren = __EXPERIMENTAL__;

42 export const disableMapsAsChildren = __EXPERIMENTAL__;

47 -export const disableUnstableRenderSubtreeIntoContainer = __EXPERIMENTAL__;

43 export const warnUnstableRenderSubtreeIntoContainer = false;

49 -export const disableUnstableCreatePortal = __EXPERIMENTAL__;

44 export const deferPassiveEffectCleanupDuringUnmount = false;

45 export const runAllPassiveEffectDestroysBeforeCreates = false;

52 -export const isTestEnvironment = true;

46 export const enableModernEventSystem = false;

47 export const warnAboutSpreadingKeyToJSX = false;

packages/shared/forks/ReactFeatureFlags.www.js

-14

@@ -45,8 +45,6 @@ export const warnAboutDefaultPropsOnFunctionComponents = false;

46 export const enableTrainModelFix = true;

48 -export const exposeConcurrentModeAPIs = true;

49 -

48 export const enableSuspenseServerRenderer = true;

49 export const enableSelectiveHydration = true;

@@ -87,8 +85,6 @@ export const enableFundamentalAPI = false;

86 export const enableScopeAPI = true;

90 -export const enableJSXTransformAPI = true;

91 -

88 export const warnAboutUnmockedScheduler = true;

90 export const enableSuspenseCallback = true;

@@ -97,22 +93,12 @@ export const flushSuspenseFallbacksInTests = true;

94 export const enableNativeTargetAsInstance = false;

100 -export const disableCreateFactory = __EXPERIMENTAL__;

101 -

102 -export const disableLegacyReactDOMAPIs = __EXPERIMENTAL__;

103 -

96 export const disableTextareaChildren = __EXPERIMENTAL__;

98 export const disableMapsAsChildren = __EXPERIMENTAL__;

108 -export const disableUnstableRenderSubtreeIntoContainer = __EXPERIMENTAL__;

109 -

100 export const warnUnstableRenderSubtreeIntoContainer = false;

101

112 -export const disableUnstableCreatePortal = __EXPERIMENTAL__;

113 -

114 -export const isTestEnvironment = false;

115 -

102 export const enableModernEventSystem = false;

103

104 // Flow magic to verify the exports of this file match the original version.

scripts/jest/config.source-persistent.js

+21

@@ -2,7 +2,28 @@

3 const baseConfig = require('./config.base');

5 +const RELEASE_CHANNEL = process.env.RELEASE_CHANNEL;

6 +

7 +// Default to building in experimental mode. If the release channel is set via

8 +// an environment variable, then check if it's "experimental".

9 +const __EXPERIMENTAL__ =

10 + typeof RELEASE_CHANNEL === 'string'

11 + ? RELEASE_CHANNEL === 'experimental'

12 + : true;

13 +

14 +const preferredExtension = __EXPERIMENTAL__ ? '.js' : '.stable.js';

15 +

16 +const moduleNameMapper = {};

17 +moduleNameMapper[

18 + '^react$'

19 +] = `<rootDir>/packages/react/index${preferredExtension}`;

20 +moduleNameMapper[

21 + '^react-dom$'

22 +] = `<rootDir>/packages/react-dom/index${preferredExtension}`;

23 +

24 module.exports = Object.assign({}, baseConfig, {

25 + // Prefer the stable forks for tests.

26 + moduleNameMapper,

27 modulePathIgnorePatterns: [

28 ...baseConfig.modulePathIgnorePatterns,

29 'packages/react-devtools-shared',

scripts/jest/config.source.js

+21

@@ -2,7 +2,28 @@

3 const baseConfig = require('./config.base');

5 +const RELEASE_CHANNEL = process.env.RELEASE_CHANNEL;

6 +

7 +// Default to building in experimental mode. If the release channel is set via

8 +// an environment variable, then check if it's "experimental".

9 +const __EXPERIMENTAL__ =

10 + typeof RELEASE_CHANNEL === 'string'

11 + ? RELEASE_CHANNEL === 'experimental'

12 + : true;

13 +

14 +const preferredExtension = __EXPERIMENTAL__ ? '.js' : '.stable.js';

15 +

16 +const moduleNameMapper = {};

17 +moduleNameMapper[

18 + '^react$'

19 +] = `<rootDir>/packages/react/index${preferredExtension}`;

20 +moduleNameMapper[

21 + '^react-dom$'

22 +] = `<rootDir>/packages/react-dom/index${preferredExtension}`;

23 +

24 module.exports = Object.assign({}, baseConfig, {

25 + // Prefer the stable forks for tests.

26 + moduleNameMapper,

27 modulePathIgnorePatterns: [

28 ...baseConfig.modulePathIgnorePatterns,

29 'packages/react-devtools-shared',

scripts/rollup/build.js

+49 -19

@@ -188,18 +188,16 @@ function getRollupOutputOptions(

188 ) {

189 const isProduction = isProductionBundleType(bundleType);

190

191 - return Object.assign(

192 - {},

193 - {

194 - file: outputPath,

195 - format,

196 - globals,

197 - freeze: !isProduction,

198 - interop: false,

199 - name: globalName,

200 - sourcemap: false,

201 - }

202 - );

191 + return {

192 + file: outputPath,

193 + format,

194 + globals,

195 + freeze: !isProduction,

196 + interop: false,

197 + name: globalName,

198 + sourcemap: false,

199 + esModule: false,

200 + };

201 }

202

203 function getFormat(bundleType) {

@@ -479,6 +477,40 @@ function shouldSkipBundle(bundle, bundleType) {

477 return false;

478 }

479

480 +function resolveEntryFork(resolvedEntry, isFBBundle) {

481 + // Pick which entry point fork to use:

482 + // .modern.fb.js

483 + // .classic.fb.js

484 + // .fb.js

485 + // .stable.js

486 + // .experimental.js

487 + // .js

488 +

489 + if (isFBBundle) {

490 + const resolvedFBEntry = resolvedEntry.replace(

491 + '.js',

492 + __EXPERIMENTAL__ ? '.modern.fb.js' : '.classic.fb.js'

493 + );

494 + if (fs.existsSync(resolvedFBEntry)) {

495 + return resolvedFBEntry;

496 + }

497 + const resolvedGenericFBEntry = resolvedEntry.replace('.js', '.fb.js');

498 + if (fs.existsSync(resolvedGenericFBEntry)) {

499 + return resolvedGenericFBEntry;

500 + }

501 + // Even if it's a FB bundle we fallthrough to pick stable or experimental if we don't have an FB fork.

502 + }

503 + const resolvedForkedEntry = resolvedEntry.replace(

504 + '.js',

505 + __EXPERIMENTAL__ ? '.experimental.js' : '.stable.js'

506 + );

507 + if (fs.existsSync(resolvedForkedEntry)) {

508 + return resolvedForkedEntry;

509 + }

510 + // Just use the plain .js one.

511 + return resolvedEntry;

512 +}

513 +

514 async function createBundle(bundle, bundleType) {

515 if (shouldSkipBundle(bundle, bundleType)) {

516 return;

@@ -490,17 +522,15 @@ async function createBundle(bundle, bundleType) {

522 const format = getFormat(bundleType);

523 const packageName = Packaging.getPackageName(bundle.entry);

524

493 - let resolvedEntry = require.resolve(bundle.entry);

525 const isFBBundle =

526 bundleType === FB_WWW_DEV ||

527 bundleType === FB_WWW_PROD ||

528 bundleType === FB_WWW_PROFILING;

498 - if (isFBBundle) {

499 - const resolvedFBEntry = resolvedEntry.replace('.js', '.fb.js');

500 - if (fs.existsSync(resolvedFBEntry)) {

501 - resolvedEntry = resolvedFBEntry;

502 - }

503 - }

529 +

530 + let resolvedEntry = resolveEntryFork(

531 + require.resolve(bundle.entry),

532 + isFBBundle

533 + );

534

535 const shouldBundleDependencies =

536 bundleType === UMD_DEV ||