From c331d113dc40500b2db4eed849b8265423015a08 Mon Sep 17 00:00:00 2001 From: David Aurelio Date: Wed, 2 Mar 2016 08:26:11 -0800 Subject: [PATCH] Fix breakages caused by switch to fbjs Summary: This fixes a couple of breakages introduced by the switch to fbjs Reviewed By: bestander Differential Revision: D3000078 fb-gh-sync-id: 2971d049030f754d5001f6729716373a64078ddf shipit-source-id: 2971d049030f754d5001f6729716373a64078ddf --- .../CustomComponents/ListView/ListView.js | 2 +- .../ListView/ListViewDataSource.js | 2 +- .../NavigationCardStack.js | 2 +- Libraries/vendor/core/isEmpty.js | 34 +++++++++++++++++++ packager/blacklist.js | 1 + 5 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 Libraries/vendor/core/isEmpty.js diff --git a/Libraries/CustomComponents/ListView/ListView.js b/Libraries/CustomComponents/ListView/ListView.js index b068737d45b..eb642d73fbe 100644 --- a/Libraries/CustomComponents/ListView/ListView.js +++ b/Libraries/CustomComponents/ListView/ListView.js @@ -34,7 +34,7 @@ var ScrollResponder = require('ScrollResponder'); var StaticRenderer = require('StaticRenderer'); var TimerMixin = require('react-timer-mixin'); -var isEmpty = require('fbjs/lib/isEmpty'); +var isEmpty = require('isEmpty'); var merge = require('merge'); var PropTypes = React.PropTypes; diff --git a/Libraries/CustomComponents/ListView/ListViewDataSource.js b/Libraries/CustomComponents/ListView/ListViewDataSource.js index cedf8b584a6..1d14e50f5b7 100644 --- a/Libraries/CustomComponents/ListView/ListViewDataSource.js +++ b/Libraries/CustomComponents/ListView/ListViewDataSource.js @@ -29,7 +29,7 @@ 'use strict'; var invariant = require('fbjs/lib/invariant'); -var isEmpty = require('fbjs/lib/isEmpty'); +var isEmpty = require('isEmpty'); var warning = require('fbjs/lib/warning'); function defaultGetRowData( diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js b/Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js index f58c49926c9..f36fbc0fe32 100644 --- a/Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js +++ b/Libraries/CustomComponents/NavigationExperimental/NavigationCardStack.js @@ -36,7 +36,7 @@ const React = require('React'); const ReactComponentWithPureRenderMixin = require('ReactComponentWithPureRenderMixin'); const StyleSheet = require('StyleSheet'); -const emptyFunction = require('emptyFunction'); +const emptyFunction = require('fbjs/lib/emptyFunction'); const {PropTypes} = React; const {Directions} = NavigationLinearPanResponder; diff --git a/Libraries/vendor/core/isEmpty.js b/Libraries/vendor/core/isEmpty.js new file mode 100644 index 00000000000..27f4c0069a0 --- /dev/null +++ b/Libraries/vendor/core/isEmpty.js @@ -0,0 +1,34 @@ +/** + * @generated SignedSource<<97ffcebc9ae390e734026a4f3964bff6>> + * + * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + * !! This file is a check-in of a static_upstream project! !! + * !! !! + * !! You should not modify this file directly. Instead: !! + * !! 1) Use `fjs use-upstream` to temporarily replace this with !! + * !! the latest version from upstream. !! + * !! 2) Make your changes, test them, etc. !! + * !! 3) Use `fjs push-upstream` to copy your changes back to !! + * !! static_upstream. !! + * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + * + * @providesModule isEmpty + */ + +/** + * Mimics empty from PHP. + */ +function isEmpty(obj) { + if (Array.isArray(obj)) { + return obj.length === 0; + } else if (typeof obj === 'object') { + for (var i in obj) { + return false; + } + return true; + } else { + return !obj; + } +} + +module.exports = isEmpty; diff --git a/packager/blacklist.js b/packager/blacklist.js index 27ec2899300..acca4c167c8 100644 --- a/packager/blacklist.js +++ b/packager/blacklist.js @@ -19,6 +19,7 @@ var sharedBlacklist = [ // fbjs forks: 'node_modules/fbjs/lib/Map.js', + 'node_modules/fbjs/lib/isEmpty.js', /website\/node_modules\/.*/,