Reorganize code structure #11288

gaearon · 2017-10-19T18:19:43Z

A few changes as a followup to Workspaces.

Entry points now have natural names, e.g. React, ReactDOM. Just like before Fiber.
We now use npm package entry points when importing in the few places we weren't. Such as ReactFiberReconciler -> react-reconciler.
Since DOM tests often test both client and server, I removed the mostly arbitary distinction and put most of them together into packages/dom/__tests__.
For DOM implementation, I did another pass at checking which files are client-only/server-only/shared, and separated them into dom/client, dom/server, and dom/shared.
I deleted a few dead files.
I moved FB-specific @preventMunge directives into flat bundle itself instead of individual source files.
I separated TestUtils and ReactDOMUnstableNativeDependencies into a separate bundle type called RENDERER_UTILS. The main difference is it shouldn't bundle a reconciler inside itself (unlike a real renderer). This is how I uncovered React Test Utils shouldn't bundle a copy of the reconciler #11280 (which I fixed in Only renderers should depend on reconciler code #11281).

The build products look mostly the same to me except for minor dependency order changes.
Bundle fixture works.

Also verified that UFI and Power Editor work in DEV and PROD.

Now that we import reconciler via react-reconciler, I needed to make a few tweaks.

bvaughn · 2017-10-19T18:25:51Z

For DOM implementation, I did another pass at checking which files are client-only/server-only/shared, and separated them into dom/client, dom/server, and dom/shared.

Nice!

bvaughn · 2017-10-19T18:29:41Z

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

@@ -41,7 +40,7 @@ ReactFiberErrorLogger.injection.injectDialog(
  ReactNativeFiberErrorDialog.showDialog,
 );

-const ReactNativeFiber: ReactNativeType = {
+const ReactNativeRenderer: ReactNativeType = {


It's a bit confusing that we now have ReactNativeRenderer that requires a file named ReactNativeFiberRenderer.

Agree. I’m also not over the moon with arbitrary ReactDOM/ReactDOMComponent separation. Need to do a pass restructuring those later.

Yeah, it's def not a blocker to this PR. Just an observation that the naming seems even weirder now 😄

bvaughn · 2017-10-19T18:31:00Z

scripts/rollup/bundles.js

 const RENDERER = moduleTypes.RENDERER;
+// Helper packages that access specific renderer's internals. (e.g. TestUtils)
+const RENDERER_UTILS = moduleTypes.RENDERER_UTILS;
+// Standalone reconciler for third-party renderers.
 const RECONCILER = moduleTypes.RECONCILER;


bvaughn · 2017-10-19T18:31:21Z

scripts/rollup/header.js

@@ -9,6 +9,7 @@ function getProvidesHeader(hasteFinalName) {
 *
 * @noflow
 * @providesModule ${hasteFinalName}
+ * @preventMunge


I forgot to @flow-ify those files. This uncovered some issues.

Prettier, I love you but you're bringing me down Like a rat in a cage Pulling minimum wage Prettier, I love you but you're bringing me down Prettier, you're safer and you're wasting my time Our records all show you were filthy but fine But they shuttered your stores When you opened the doors To the cops who were bored once they'd run out of crime Prettier, you're perfect, oh, please don't change a thing Your mild billionaire mayor's now convinced he's a king So the boring collect I mean all disrespect In the neighborhood bars I'd once dreamt I would drink Prettier, I love you but you're freaking me out There's a ton of the twist but we're fresh out of shout Like a death in the hall That you hear through your wall Prettier, I love you but you're freaking me out Prettier, I love you but you're bringing me down Prettier, I love you but you're bringing me down Like a death of the heart Jesus, where do I start? But you're still the one pool where I'd happily drown And oh! Take me off your mailing list For kids who think it still exists Yes, for those who think it still exists Maybe I'm wrong and maybe you're right Maybe I'm wrong and maybe you're right Maybe you're right, maybe I'm wrong And just maybe you're right And oh! Maybe mother told you true And there'll always be somebody there for you And you'll never be alone But maybe she's wrong and maybe I'm right And just maybe she's wrong Maybe she's wrong and maybe I'm right And if so, here's this song!

gaearon · 2017-10-19T18:50:22Z

Only prettier failed last time so this is good to go.

Yeti-or · 2017-10-20T00:06:17Z

packages/react-reconciler/index.js

+  HostConfig,
+  Deadline,
+  Reconciler,
+} from './src/ReactFiberReconciler';


Great song by the way 😆

* Move files and tests to more meaningful places * Fix the build Now that we import reconciler via react-reconciler, I needed to make a few tweaks. * Update sizes * Move @preventMunge directive to FB header * Revert unintentional change * Fix Flow coverage I forgot to @flow-ify those files. This uncovered some issues. * Prettier, I love you but you're bringing me down Prettier, I love you but you're bringing me down Like a rat in a cage Pulling minimum wage Prettier, I love you but you're bringing me down Prettier, you're safer and you're wasting my time Our records all show you were filthy but fine But they shuttered your stores When you opened the doors To the cops who were bored once they'd run out of crime Prettier, you're perfect, oh, please don't change a thing Your mild billionaire mayor's now convinced he's a king So the boring collect I mean all disrespect In the neighborhood bars I'd once dreamt I would drink Prettier, I love you but you're freaking me out There's a ton of the twist but we're fresh out of shout Like a death in the hall That you hear through your wall Prettier, I love you but you're freaking me out Prettier, I love you but you're bringing me down Prettier, I love you but you're bringing me down Like a death of the heart Jesus, where do I start? But you're still the one pool where I'd happily drown And oh! Take me off your mailing list For kids who think it still exists Yes, for those who think it still exists Maybe I'm wrong and maybe you're right Maybe I'm wrong and maybe you're right Maybe you're right, maybe I'm wrong And just maybe you're right And oh! Maybe mother told you true And there'll always be somebody there for you And you'll never be alone But maybe she's wrong and maybe I'm right And just maybe she's wrong Maybe she's wrong and maybe I'm right And if so, here's this song!

gaearon added 4 commits October 19, 2017 19:12

Move files and tests to more meaningful places

1361460

Fix the build

a9694e8

Now that we import reconciler via react-reconciler, I needed to make a few tweaks.

Update sizes

095022a

Move @preventMunge directive to FB header

8c1df7b

facebook-github-bot added the CLA Signed label Oct 19, 2017

Revert unintentional change

777122f

gaearon requested review from bvaughn and trueadm October 19, 2017 18:23

bvaughn approved these changes Oct 19, 2017

View reviewed changes

Fix Flow coverage

571650d

I forgot to @flow-ify those files. This uncovered some issues.

sebmarkbage approved these changes Oct 19, 2017

View reviewed changes

gaearon merged commit 3136115 into facebook:master Oct 19, 2017

Yeti-or reviewed Oct 20, 2017

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reorganize code structure #11288

Reorganize code structure #11288

gaearon commented Oct 19, 2017

bvaughn commented Oct 19, 2017

bvaughn Oct 19, 2017

gaearon Oct 19, 2017

bvaughn Oct 19, 2017

bvaughn Oct 19, 2017

bvaughn Oct 19, 2017

gaearon commented Oct 19, 2017

Yeti-or Oct 20, 2017

Reorganize code structure #11288

Reorganize code structure #11288

Conversation

gaearon commented Oct 19, 2017

bvaughn commented Oct 19, 2017

bvaughn Oct 19, 2017

Choose a reason for hiding this comment

gaearon Oct 19, 2017

Choose a reason for hiding this comment

bvaughn Oct 19, 2017

Choose a reason for hiding this comment

bvaughn Oct 19, 2017

Choose a reason for hiding this comment

bvaughn Oct 19, 2017

Choose a reason for hiding this comment

gaearon commented Oct 19, 2017

Yeti-or Oct 20, 2017

Choose a reason for hiding this comment