Skip to content

Commit 4b2eac3

Browse files
authored
Convert current build system to Rollup and adopt flat bundles (#9327)
* WIP * fbjs support * WIP * dev/prod mode WIP * More WIP * builds a cjs bundle * adding forwarding modules * more progress on forwarding modules and FB config * improved how certain modules get inlined for fb and cjs * more forwarding modules * added comments to the module aliasing code * made ReactPerf and ReactTestUtils bundle again * Use -core suffix for all bundles This makes it easier to override things in www. * Add a lazy shim for ReactPerf This prevents a circular dependency between ReactGKJSModule and ReactDOM * Fix forwarding module for ReactCurrentOwner * Revert "Add a lazy shim for ReactPerf" This reverts commit 723b402. * Rename -core suffix to -fb for clarity * Change forwarding modules to import from -fb This is another, more direct fix for ReactPerf circular dependency * should fix fb and cjs bundles for ReactCurrentOwner * added provides module for ReactCurrentOwner * should improve console output * fixed typo with argument passing on functon call * Revert "should improve console output" This breaks the FB bundles. This reverts commit 65f11ee. * Work around internal FB transform require() issue * moved ReactInstanceMap out of React and into ReactDOM and ReactDOMFiber * Expose more internal modules to www * Add missing modules to Stack ReactDOM to fix UFI * Fix onlyChild module * improved the build tool * Add a rollup npm script * Rename ReactDOM-fb to ReactDOMStack-fb * Fix circular dependencies now that ReactDOM-fb is a GK switch * Revert "Work around internal FB transform require() issue" This reverts commit 0a50b6a. * Bump rollup-plugin-commonjs to include a fix for rollup/rollup-plugin-commonjs#176 * Add more forwarding modules that are used on www * Add even more forwarding modules that are used on www * Add DOMProperty to hidden exports * Externalize feature flags This lets www specify them dynamically. * Remove forwarding modules with implementations Instead I'm adding them to react-fb in my diff. * Add all injection necessary for error logging * Add missing forwarding module (oops) * Add ReactART builds * Add ReactDOMServer bundle * Fix UMD build of ReactDOMFiber * Work in progress: start adding ReactNative bundle * tidied up the options for bundles, so they can define what types they output and exclude * Add a working RN build * further improved and tidied up build process * improved how bundles are built by exposing externals and making the process less "magical", also tidied up code and added more comments * better handling of bundling ReactCurrentOwner and accessing it from renderer modules * added NODE_DEV and NODE_PROD * added NPM package creation and copying into build chain * Improved UMD bundles, added better fixture testing and doc plus prod builds * updated internal modules (WIP) * removed all react/lib/* dependencies from appearing in bundles created on build * added react-test-renderer bundles * renamed bundles and paths * fixed fixture path changes * added extract-errors support * added extractErrors warning * moved shims to shims directory in rollup scripts * changed pathing to use build rather than build/rollup * updated release doc to reflect some rollup changes * Updated ReactNative findNodeHandle() to handle number case (#9238) * Add dynamic injection to ReactErrorUtils (#9246) * Fix ReactErrorUtils injection (#9247) * Fix Haste name * Move files around * More descriptive filenames * Add missing ReactErrorUtils shim * Tweak reactComponentExpect to make it standalone-ish in www * Unflowify shims * facebook-www shims now get copied over correctly to build * removed unnecessary resolve * building facebook-www/build is now all sync to prevent IO issues plus handles extra facebook-www src assets * removed react-native-renderer package and made build make a react-native build dir instead * 😭😭😭 * Add more SSR unit tests for elements and children. (#9221) * Adding more SSR unit tests for elements and children. * Some of my SSR tests were testing for react-text and react-empty elements that no longer exist in Fiber. Fixed the tests so that they expect correct markup in Fiber. * Tweaked some test names after @gaearon review comment #9221 (comment) . Also realized that one of the tests was essentially a direct copy of another, so deleted it. * Responding to code review #9221 (review) . Thanks @spicyj! * ReactElementValidator uses temporary ReactNative View propTypes getter (#9256) * Updating packages for 16.0.0-alpha.6 release * Revert "😭😭😭" This reverts commit 7dba33b. * Work around Jest issue with CurrentOwner shared state in www * updated error codes * splits FB into FB_DEV and FB_PROD * Remove deps on specific builds from shims * should no longer mangle FB_PROD output * Added init() dev block to ReactTestUtils * added shims for DEV only code so it does not get included in prod bundles * added a __DEV__ wrapping code to FB_DEV * added __DEV__ flag behind a footer/header * Use right haste names * keeps comments in prod * added external babel helpers plugin * fixed fixtures and updated cjs/umd paths * Fixes Jest so it run tests correctly * fixed an issue with stubbed modules not properly being replaced due to greedy replacement * added a WIP solution for ReactCurrentOwner on FB DEV * adds a FB_TEST bundle * allows both ReactCurrentOwner and react/lib/ReactCurrentOwner * adds -test to provides module name * Remove TEST env * Ensure requires stay at the top * added basic mangle support (disbaled by default) * per bundle property mangling added * moved around plugin order to try and fix deadcode requires as per rollup/rollup#855 * Fix flow issues * removed gulp and grunt and moved tasks to standalone node script * configured circleci to use new paths * Fix lint * removed gulp-extract-errors * added test_build.sh back in * added missing newline to flow.js * fixed test coverage command * changed permissions on test_build.sh * fixed test_html_generations.sh * temp removed html render test * removed the warning output from test_build, the build should do this instead * fixed test_build * fixed broken npm script * Remove unused ViewportMetrics shim * better error output * updated circleci to node 7 for async/await * Fixes * removed coverage test from circleci run * circleci run tets * removed build from circlci * made a dedicated jest script in a new process * moved order around of circlci tasks * changing path to jest in more circleci tests * re-enabled code coverage * Add file header to prod bundles * Remove react-dom/server.js (WIP: decide on the plan) * Only UMD bundles need version header * Merge with master * disabled const evaluation by uglify for <script></script> string literal * deal with ART modules for UMD bundles * improved how bundle output gets printed * fixed filesize difference reporting * added filesize dep * Update yarn lockfile for some reason * now compares against the last run branch built on * added react-dom-server * removed un-needed comment * results only get saved on full builds * moved the rollup sized plugin into a plugins directory * added a missing commonjs() * fixed missing ignore * Hack around to fix RN bundle * Partially fix RN bundles * added react-art bundle and a fixture for it * Point UMD bundle to Fiber and add EventPluginHub to exported internals * Make it build on Node 4 * fixed eslint error with resolve being defined in outer scope * Tweak how build results are calculated and stored * Tweak fixtures build to work on Node 4 * Include LICENSE/PATENTS and fix up package.json files * Add Node bundle for react-test-renderer * Revert "Hack around to fix RN bundle" We'll do this later. This reverts commit 59445a6. * Revert more RN changes We'll do them separately later * Revert more unintentional changes * Revert changes to error codes * Add accidentally deleted RN externals * added RN_DEV/RN_PROD bundles * fixed typo where RN_DEV and RN_PROD were the wrong way around * Delete/ignore fixture build outputs * Format scripts/ with Prettier * tidied up the Rollup build process and split functions into various different files to improve readability * Copy folder before files * updated yarn.lock * updated results and yarn dependencies to the latest versions
1 parent d99b3fc commit 4b2eac3

240 files changed

Lines changed: 7981 additions & 4690 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.babelrc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919
"transform-es2015-parameters",
2020
["transform-es2015-destructuring", { "loose": true }],
2121
["transform-es2015-block-scoping", { "throwIfClosureRequired": true }],
22-
"transform-es2015-modules-commonjs",
2322
"transform-es3-member-expression-literals",
24-
"transform-es3-property-literals",
25-
"./scripts/babel/transform-object-assign-require",
26-
"transform-react-jsx-source"
23+
"transform-es3-property-literals"
2724
]
2825
}

.flowconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PROJECT_ROOT>/fixtures/.*
44
<PROJECT_ROOT>/build/.*
5+
<PROJECT_ROOT>/scripts/.*
56
<PROJECT_ROOT>/.*/node_modules/y18n/.*
67
<PROJECT_ROOT>/.*/__mocks__/.*
78
<PROJECT_ROOT>/.*/__tests__/.*

Gruntfile.js

Lines changed: 0 additions & 202 deletions
This file was deleted.

circle.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ dependencies:
3333
# - npm ls --depth=0
3434
cache_directories:
3535
- docs/vendor/bundle
36-
- .grunt # Show size comparisons between builds
3736
- ~/react-gh-pages # docs checkout
3837
- ~/.yarn
3938
- ~/.yarn-cache

eslint-rules/__tests__/no-primitive-constructors-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ ruleTester.run('eslint-rules/no-primitive-constructors', rule, {
3434
code: 'String(obj)',
3535
errors: [
3636
{
37-
message: 'Do not use the String constructor. To cast a value to a string, concat it with the empty string (unless it\'s a symbol, which has different semantics): \'\' + value',
37+
message: 'Do not use the String constructor. To cast a value to a string, ' +
38+
'concat it with the empty string (unless it\'s a symbol, which has different semantics): \'\' + value',
3839
},
3940
],
4041
},

fixtures/art/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bundle.js

fixtures/art/README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# VectorWidget example
2+
3+
To try this example, run:
4+
5+
```
6+
npm install
7+
npm run build
8+
```
9+
10+
in this directory, then open index.html in your browser.

fixtures/art/VectorWidget.js

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
/**
2+
* Copyright 2013 Facebook, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the BSD-style license found in the
6+
* LICENSE file in the root directory of this source tree. An additional grant
7+
* of patent rights can be found in the PATENTS file in the same directory.
8+
*/
9+
"use strict";
10+
11+
var React = require('react');
12+
var ReactART = require('react-art');
13+
var Group = ReactART.Group;
14+
var Shape = ReactART.Shape;
15+
var Surface = ReactART.Surface;
16+
var Transform = ReactART.Transform;
17+
18+
var MOUSE_UP_DRAG = 0.978;
19+
var MOUSE_DOWN_DRAG = 0.9;
20+
var MAX_VEL = 11;
21+
var CLICK_ACCEL = 3;
22+
var BASE_VEL = 0.15;
23+
24+
/**
25+
* An animated SVG component.
26+
*/
27+
var VectorWidget = React.createClass({
28+
/**
29+
* Initialize state members.
30+
*/
31+
getInitialState: function() {
32+
return {degrees: 0, velocity: 0, drag: MOUSE_UP_DRAG};
33+
},
34+
35+
/**
36+
* When the component is mounted into the document - this is similar to a
37+
* constructor, but invoked when the instance is actually mounted into the
38+
* document. Here's, we'll just set up an animation loop that invokes our
39+
* method. Binding of `this.onTick` is not needed because all React methods
40+
* are automatically bound before being mounted.
41+
*/
42+
componentDidMount: function() {
43+
this._interval = window.setInterval(this.onTick, 20);
44+
},
45+
46+
componentWillUnmount: function() {
47+
window.clearInterval(this._interval);
48+
},
49+
50+
onTick: function() {
51+
var nextDegrees = this.state.degrees + BASE_VEL + this.state.velocity;
52+
var nextVelocity = this.state.velocity * this.state.drag;
53+
this.setState({degrees: nextDegrees, velocity: nextVelocity});
54+
},
55+
56+
/**
57+
* When mousing down, we increase the friction down the velocity.
58+
*/
59+
handleMouseDown: function() {
60+
this.setState({drag: MOUSE_DOWN_DRAG});
61+
},
62+
63+
/**
64+
* Cause the rotation to "spring".
65+
*/
66+
handleMouseUp: function() {
67+
var nextVelocity = Math.min(this.state.velocity + CLICK_ACCEL, MAX_VEL);
68+
this.setState({velocity: nextVelocity, drag: MOUSE_UP_DRAG});
69+
},
70+
71+
/**
72+
* This is the "main" method for any component. The React API allows you to
73+
* describe the structure of your UI component at *any* point in time.
74+
*/
75+
render: function() {
76+
return (
77+
<Surface
78+
width={700}
79+
height={700}
80+
style={{cursor: 'pointer'}}>
81+
{this.renderGraphic(this.state.degrees)}
82+
</Surface>
83+
);
84+
},
85+
86+
/**
87+
* Better SVG support for React coming soon.
88+
*/
89+
renderGraphic: function(rotation) {
90+
91+
return (
92+
<Group
93+
onMouseDown={this.handleMouseDown}
94+
onMouseUp={this.handleMouseUp}>
95+
<Group x={210} y={135}>
96+
<Shape fill="rgba(0,0,0,0.1)" d={BORDER_PATH} />
97+
<Shape fill="#7BC7BA" d={BG_PATH} />
98+
<Shape fill="#DCDCDC" d={BAR_PATH} />
99+
<Shape fill="#D97B76" d={RED_DOT_PATH} />
100+
<Shape fill="#DBBB79" d={YELLOW_DOT_PATH} />
101+
<Shape fill="#A6BD8A" d={GREEN_DOT_PATH} />
102+
<Group x={55} y={29}>
103+
<Group rotation={rotation} originX={84} originY={89}>
104+
<Shape fill="#FFFFFF" d={CENTER_DOT_PATH} />
105+
<Group>
106+
<Shape d={RING_ONE_PATH} stroke="#FFFFFF" strokeWidth={8} />
107+
<Shape d={RING_TWO_PATH} transform={RING_TWO_ROTATE} stroke="#FFFFFF" strokeWidth={8} />
108+
<Shape d={RING_THREE_PATH} transform={RING_THREE_ROTATE} stroke="#FFFFFF" strokeWidth={8} />
109+
</Group>
110+
</Group>
111+
</Group>
112+
</Group>
113+
</Group>
114+
);
115+
}
116+
});
117+
118+
var BORDER_PATH = "M3.00191459,4 C1.34400294,4 0,5.34785514 0,7.00550479 L0,220.994495 C0,222.65439 1.34239483,224 3.00191459,224 L276.998085,224 C278.655997,224 280,222.652145 280,220.994495 L280,7.00550479 C280,5.34561033 278.657605,4 276.998085,4 L3.00191459,4 Z M3.00191459,4";
119+
var BG_PATH = "M3.00191459,1 C1.34400294,1 0,2.34785514 0,4.00550479 L0,217.994495 C0,219.65439 1.34239483,221 3.00191459,221 L276.998085,221 C278.655997,221 280,219.652145 280,217.994495 L280,4.00550479 C280,2.34561033 278.657605,1 276.998085,1 L3.00191459,1 Z M3.00191459,1";
120+
var BAR_PATH = "M3.00191459,0 C1.34400294,0 0,1.34559019 0,3.00878799 L0,21 C0,21 0,21 0,21 L280,21 C280,21 280,21 280,21 L280,3.00878799 C280,1.34708027 278.657605,0 276.998085,0 L3.00191459,0 Z M3.00191459,0";
121+
var RED_DOT_PATH = "M12.5,17 C16.0898511,17 19,14.0898511 19,10.5 C19,6.91014895 16.0898511,4 12.5,4 C8.91014895,4 6,6.91014895 6,10.5 C6,14.0898511 8.91014895,17 12.5,17 Z M12.5,17";
122+
var YELLOW_DOT_PATH = "M31.5,17 C35.0898511,17 38,14.0898511 38,10.5 C38,6.91014895 35.0898511,4 31.5,4 C27.9101489,4 25,6.91014895 25,10.5 C25,14.0898511 27.9101489,17 31.5,17 Z M31.5,17";
123+
var GREEN_DOT_PATH = "M50.5,17 C54.0898511,17 57,14.0898511 57,10.5 C57,6.91014895 54.0898511,4 50.5,4 C46.9101489,4 44,6.91014895 44,10.5 C44,14.0898511 46.9101489,17 50.5,17 Z M50.5,17";
124+
var CENTER_DOT_PATH = "M84,105 C92.8365564,105 100,97.8365564 100,89 C100,80.1634436 92.8365564,73 84,73 C75.1634436,73 68,80.1634436 68,89 C68,97.8365564 75.1634436,105 84,105 Z M84,105";
125+
var RING_ONE_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121";
126+
var RING_TWO_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121";
127+
var RING_THREE_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121";
128+
var RING_TWO_ROTATE = new Transform().translate(84.000000, 89.000000).rotate(-240.000000).translate(-84.000000, -89.000000);
129+
var RING_THREE_ROTATE = new Transform().translate(84.000000, 89.000000).rotate(-300.000000).translate(-84.000000, -89.000000);
130+
131+
module.exports = VectorWidget;
132+

fixtures/art/app.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
3+
var React = require('react');
4+
var ReactDOM = require('react-dom');
5+
var VectorWidget = require('./VectorWidget');
6+
7+
ReactDOM.render(<VectorWidget />, document.getElementById('container'));

0 commit comments

Comments
 (0)