diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 543158439b..bc2a9e3a93 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -9,9 +9,10 @@ const alias = require('rollup-plugin-alias');
 const inject = require('rollup-plugin-inject');
 const { createModuleMap } = require('./moduleMap');
 const { getFbjsModuleAliases } = require('./fbjs');
-const nodeResolve = require('rollup-plugin-node-resolve');
 
-const external = [];
+const external = [
+  'fbjs/lib/warning',
+];
 
 function getAliases(paths) {
   return Object.assign(
@@ -27,7 +28,6 @@ function getPlugins(entry, babelOpts, paths) {
       'Object.assign': resolve('./node_modules/object-assign/index.js'),
     }),
     alias(getAliases(paths)),
-    // nodeResolve({ jsnext: false, main: true }),
     commonjs(),
   ];
 }
diff --git a/scripts/rollup/fbjs.js b/scripts/rollup/fbjs.js
index 831b34d2d0..7b544e40f4 100644
--- a/scripts/rollup/fbjs.js
+++ b/scripts/rollup/fbjs.js
@@ -6,8 +6,8 @@ function getFbjsModuleAliases() {
   return {
     hyphenateStyleName: resolve('./node_modules/fbjs/lib/hyphenateStyleName.js'),
     getUnboundedScrollPosition: resolve('./node_modules/fbjs/lib/getUnboundedScrollPosition.js'),
-    emptyFunction: resolve('./node_modules/fbjs/lib/emptyFunction.js'),
-    emptyObject: resolve('./node_modules/fbjs/lib/emptyObject.js'),
+    'fbjs/lib/emptyFunction': resolve('./node_modules/fbjs/lib/emptyFunction.js'),
+    'fbjs/lib/emptyObject': resolve('./node_modules/fbjs/lib/emptyObject.js'),
     camelizeStyleName: resolve('./node_modules/fbjs/lib/camelizeStyleName.js'),
     containsNode: resolve('./node_modules/fbjs/lib/containsNode.js'),
     shallowEqual: resolve('./node_modules/fbjs/lib/shallowEqual.js'),
@@ -16,9 +16,9 @@ function getFbjsModuleAliases() {
     EventListener: resolve('./node_modules/fbjs/lib/EventListener.js'),
     memoizeStringOnly: resolve('./node_modules/fbjs/lib/memoizeStringOnly.js'),
     ExecutionEnvironment: resolve('./node_modules/fbjs/lib/ExecutionEnvironment.js'),
-    warning: resolve('./node_modules/fbjs/lib/warning.js'),
+    'fbjs/lib/warning': resolve('./node_modules/fbjs/lib/warning.js'),
     reactProdInvariant: resolve('./src/shared/utils/reactProdInvariant.js'),
-    invariant: resolve('./test/stub.js'),
+    'fbjs/lib/invariant': resolve('./node_modules/fbjs/lib/invariant.js'),
   };
 }