Skip to content

Prevent fiber code from leaking into RN stack renderer (and vice versa) #9775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bvaughn merged 1 commit into from
May 25, 2017
Merged

Prevent fiber code from leaking into RN stack renderer (and vice versa) #9775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions scripts/rollup/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,8 @@ function getPlugins(
hasteName,
isRenderer,
manglePropertiesOnProd,
useFiber
useFiber,
modulesToStub
) {
const plugins = [
babel(updateBabelConfig(babelOpts, bundleType)),
Expand All @@ -298,7 +299,11 @@ function getPlugins(
),
];

const replaceModules = Modules.getDefaultReplaceModules(bundleType);
const replaceModules = Modules.getDefaultReplaceModules(
bundleType,
modulesToStub
);

// We have to do this check because Rollup breaks on empty object.
// TODO: file an issue with rollup-plugin-replace.
if (Object.keys(replaceModules).length > 0) {
Expand Down Expand Up @@ -420,7 +425,8 @@ function createBundle(bundle, bundleType) {
bundle.hasteName,
bundle.isRenderer,
bundle.manglePropertiesOnProd,
bundle.useFiber
bundle.useFiber,
bundle.modulesToStub
),
})
.then(result =>
Expand Down
11 changes: 11 additions & 0 deletions scripts/rollup/bundles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,12 @@ const bundles = [
'src/shared/**/*.js',
],
useFiber: false,
modulesToStub: [
"'createReactNativeFiberComponentClass'",
"'ReactNativeFiberRenderer'",
"'findNumericNodeHandleFiber'",
"'ReactNativeFiber'",
],
},
{
babelOpts: babelOptsReact,
Expand Down Expand Up @@ -353,6 +359,11 @@ const bundles = [
'src/shared/**/*.js',
],
useFiber: true,
modulesToStub: [
"'createReactNativeComponentClass'",
"'findNumericNodeHandleStack'",
"'ReactNativeStack'",
],
},

/******* React Test Renderer *******/
Expand Down
17 changes: 15 additions & 2 deletions scripts/rollup/modules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,18 @@ function replaceLegacyModuleAliases(bundleType) {
}
}

function replaceBundleStubModules(bundleModulesToStub) {
const stubbedModules = {};

if (Array.isArray(bundleModulesToStub)) {
bundleModulesToStub.forEach(module => {
stubbedModules[module] = devOnlyModuleStub;
});
}

return stubbedModules;
}

function getAliases(paths, bundleType, isRenderer, extractErrors) {
return Object.assign(
createModuleMap(
Expand All @@ -278,12 +290,13 @@ function getAliases(paths, bundleType, isRenderer, extractErrors) {
);
}

function getDefaultReplaceModules(bundleType) {
function getDefaultReplaceModules(bundleType, bundleModulesToStub) {
return Object.assign(
{},
replaceFbjsModuleAliases(bundleType),
replaceDevOnlyStubbedModules(bundleType),
replaceLegacyModuleAliases(bundleType)
replaceLegacyModuleAliases(bundleType),
replaceBundleStubModules(bundleModulesToStub)
);
}

Expand Down
40 changes: 20 additions & 20 deletions scripts/rollup/results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"gzip": 38682
},
"react-dom-server.development.js (UMD_DEV)": {
"size": 525896,
"gzip": 126687
"size": 525947,
"gzip": 126689
},
"react-dom-server.production.min.js (UMD_PROD)": {
"size": 111581,
"gzip": 34959
"size": 111505,
"gzip": 34936
},
"react-art.development.js (UMD_DEV)": {
"size": 349191,
Expand Down Expand Up @@ -73,12 +73,12 @@
"gzip": 94091
},
"react-dom-server.development.js (NODE_DEV)": {
"size": 474459,
"gzip": 114087
"size": 474510,
"gzip": 114092
},
"react-dom-server.production.min.js (NODE_PROD)": {
"size": 105956,
"gzip": 32782
"size": 105880,
"gzip": 32763
},
"ReactDOMServerStack-dev.js (FB_DEV)": {
"size": 455996,
Expand Down Expand Up @@ -157,28 +157,28 @@
"gzip": 2234
},
"ReactDOMServerStream-dev.js (FB_DEV)": {
"size": 472928,
"gzip": 113934
"size": 472979,
"gzip": 113937
},
"ReactDOMServerStream-prod.js (FB_PROD)": {
"size": 345931,
"gzip": 83505
"size": 345258,
"gzip": 83320
},
"ReactNativeStack-dev.js (RN_DEV)": {
"size": 351200,
"gzip": 63905
"size": 183071,
"gzip": 35604
},
"ReactNativeStack-prod.js (RN_PROD)": {
"size": 269602,
"gzip": 46634
"size": 131236,
"gzip": 24775
},
"ReactNativeFiber-dev.js (RN_DEV)": {
"size": 328134,
"gzip": 59569
"size": 271213,
"gzip": 49113
},
"ReactNativeFiber-prod.js (RN_PROD)": {
"size": 248866,
"gzip": 43107
"size": 207321,
"gzip": 35756
}
}
}