Skip to content

Commit 4148976

Browse files
cpojerfacebook-github-bot
authored andcommitted
Use invariant instead of fbjs/lib/invariant
Summary: This is one more step to remove `fbjs` from `react-native-github`. This changes both the internal and external code to use `invariant` from zertosh instead of the copy in fbjs. Reviewed By: yungsters Differential Revision: D13195941 fbshipit-source-id: 73564ca1715110e7da9c7ef56dc57374d61377e0
1 parent cb6eb03 commit 4148976

File tree

76 files changed

+75
-92
lines changed

Some content is hidden

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

76 files changed

+75
-92
lines changed

.flowconfig

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
.*/Libraries/polyfills/.*
2424

2525
; These should not be required directly
26-
; require from fbjs/lib instead: require('fbjs/lib/invariant')
27-
.*/node_modules/invariant/.*
26+
; require from fbjs/lib instead: require('fbjs/lib/warning')
2827
.*/node_modules/warning/.*
2928

3029
[include]

.flowconfig.android

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
.*/Libraries/polyfills/.*
2424

2525
; These should not be required directly
26-
; require from fbjs/lib instead: require('fbjs/lib/invariant')
27-
.*/node_modules/invariant/.*
26+
; require from fbjs/lib instead: require('fbjs/lib/warning')
2827
.*/node_modules/warning/.*
2928

3029
[include]

IntegrationTests/LoggingTestModule.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
const BatchedBridge = require('BatchedBridge');
1313

1414
const warning = require('fbjs/lib/warning');
15-
const invariant = require('fbjs/lib/invariant');
15+
const invariant = require('invariant');
1616

1717
const LoggingTestModule = {
1818
logToConsole: function(str) {

Libraries/ART/ReactNativeART.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
1919

2020
const createReactNativeComponentClass = require('createReactNativeComponentClass');
2121
const merge = require('merge');
22-
const invariant = require('fbjs/lib/invariant');
22+
const invariant = require('invariant');
2323

2424
// Diff Helpers
2525

Libraries/ActionSheetIOS/ActionSheetIOS.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
const RCTActionSheetManager = require('NativeModules').ActionSheetManager;
1313

14-
const invariant = require('fbjs/lib/invariant');
14+
const invariant = require('invariant');
1515
const processColor = require('processColor');
1616

1717
/**

Libraries/Animated/src/AnimatedEvent.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const AnimatedValue = require('./nodes/AnimatedValue');
1313
const NativeAnimatedHelper = require('./NativeAnimatedHelper');
1414
const ReactNative = require('ReactNative');
1515

16-
const invariant = require('fbjs/lib/invariant');
16+
const invariant = require('invariant');
1717
const {shouldUseNativeDriver} = require('./NativeAnimatedHelper');
1818

1919
export type Mapping = {[key: string]: Mapping} | AnimatedValue;

Libraries/Animated/src/NativeAnimatedHelper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
const NativeAnimatedModule = require('NativeModules').NativeAnimatedModule;
1313
const NativeEventEmitter = require('NativeEventEmitter');
1414

15-
const invariant = require('fbjs/lib/invariant');
15+
const invariant = require('invariant');
1616

1717
import type {AnimationConfig} from './animations/Animation';
1818
import type {EventConfig} from './AnimatedEvent';

Libraries/Animated/src/animations/SpringAnimation.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const AnimatedValueXY = require('../nodes/AnimatedValueXY');
1414
const Animation = require('./Animation');
1515
const SpringConfig = require('../SpringConfig');
1616

17-
const invariant = require('fbjs/lib/invariant');
17+
const invariant = require('invariant');
1818
const {shouldUseNativeDriver} = require('../NativeAnimatedHelper');
1919

2020
import type {AnimationConfig, EndCallback} from './Animation';

Libraries/Animated/src/createAnimatedComponent.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const AnimatedProps = require('./nodes/AnimatedProps');
1414
const React = require('React');
1515
const DeprecatedViewStylePropTypes = require('DeprecatedViewStylePropTypes');
1616

17-
const invariant = require('fbjs/lib/invariant');
17+
const invariant = require('invariant');
1818

1919
function createAnimatedComponent(Component: any): any {
2020
invariant(

Libraries/Animated/src/nodes/AnimatedInterpolation.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const AnimatedNode = require('./AnimatedNode');
1414
const AnimatedWithChildren = require('./AnimatedWithChildren');
1515
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
1616

17-
const invariant = require('fbjs/lib/invariant');
17+
const invariant = require('invariant');
1818
const normalizeColor = require('normalizeColor');
1919

2020
type ExtrapolateType = 'extend' | 'identity' | 'clamp';

Libraries/Animated/src/nodes/AnimatedNode.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
1313

14-
const invariant = require('fbjs/lib/invariant');
14+
const invariant = require('invariant');
1515

1616
// Note(vjeux): this would be better as an interface but flow doesn't
1717
// support them yet

Libraries/Animated/src/nodes/AnimatedProps.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const AnimatedStyle = require('./AnimatedStyle');
1515
const NativeAnimatedHelper = require('../NativeAnimatedHelper');
1616
const ReactNative = require('ReactNative');
1717

18-
const invariant = require('fbjs/lib/invariant');
18+
const invariant = require('invariant');
1919

2020
class AnimatedProps extends AnimatedNode {
2121
_props: Object;

Libraries/Animated/src/nodes/AnimatedValueXY.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
const AnimatedValue = require('./AnimatedValue');
1313
const AnimatedWithChildren = require('./AnimatedWithChildren');
1414

15-
const invariant = require('fbjs/lib/invariant');
15+
const invariant = require('invariant');
1616

1717
type ValueXYListenerCallback = (value: {x: number, y: number}) => void;
1818

Libraries/AppState/AppState.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const NativeModules = require('NativeModules');
1616
const RCTAppState = NativeModules.AppState;
1717

1818
const logError = require('logError');
19-
const invariant = require('fbjs/lib/invariant');
19+
const invariant = require('invariant');
2020

2121
/**
2222
* `AppState` can tell you if the app is in the foreground or background,

Libraries/BatchedBridge/MessageQueue.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const ErrorUtils = require('ErrorUtils');
1414
const Systrace = require('Systrace');
1515

1616
const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');
17-
const invariant = require('fbjs/lib/invariant');
17+
const invariant = require('invariant');
1818
const stringifySafe = require('stringifySafe');
1919

2020
export type SpyData = {

Libraries/BatchedBridge/NativeModules.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
const BatchedBridge = require('BatchedBridge');
1414

15-
const invariant = require('fbjs/lib/invariant');
15+
const invariant = require('invariant');
1616

1717
import type {ExtendedError} from 'parseErrorStack';
1818

Libraries/Blob/File.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
const Blob = require('Blob');
1313

14-
const invariant = require('fbjs/lib/invariant');
14+
const invariant = require('invariant');
1515

1616
import type {BlobOptions} from 'BlobTypes';
1717

Libraries/CameraRoll/CameraRoll.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const {checkPropTypes} = PropTypes;
1414
const RCTCameraRollManager = require('NativeModules').CameraRollManager;
1515

1616
const deprecatedCreateStrictShapeTypeChecker = require('deprecatedCreateStrictShapeTypeChecker');
17-
const invariant = require('fbjs/lib/invariant');
17+
const invariant = require('invariant');
1818

1919
const GROUP_TYPES_OPTIONS = {
2020
Album: 'Album',

Libraries/Components/Button.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const TouchableNativeFeedback = require('TouchableNativeFeedback');
1818
const TouchableOpacity = require('TouchableOpacity');
1919
const View = require('View');
2020

21-
const invariant = require('fbjs/lib/invariant');
21+
const invariant = require('invariant');
2222

2323
import type {PressEvent} from 'CoreEventTypes';
2424

Libraries/Components/DatePicker/DatePickerIOS.ios.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
'use strict';
1515

1616
const React = require('React');
17-
const invariant = require('fbjs/lib/invariant');
1817
const StyleSheet = require('StyleSheet');
1918
const View = require('View');
2019

20+
const invariant = require('invariant');
2121
const requireNativeComponent = require('requireNativeComponent');
2222

2323
import type {ViewProps} from 'ViewPropTypes';

Libraries/Components/Keyboard/Keyboard.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
'use strict';
1212

1313
const LayoutAnimation = require('LayoutAnimation');
14-
const invariant = require('fbjs/lib/invariant');
14+
const invariant = require('invariant');
1515
const NativeEventEmitter = require('NativeEventEmitter');
1616
const KeyboardObserver = require('NativeModules').KeyboardObserver;
1717
const dismissKeyboard = require('dismissKeyboard');

Libraries/Components/ScrollResponder.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const ReactNative = require('ReactNative');
1717
const TextInputState = require('TextInputState');
1818
const UIManager = require('UIManager');
1919

20-
const invariant = require('fbjs/lib/invariant');
20+
const invariant = require('invariant');
2121
const nullthrows = require('nullthrows');
2222
const performanceNow = require('fbjs/lib/performanceNow');
2323
const warning = require('fbjs/lib/warning');

Libraries/Components/ScrollView/ScrollView.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const InternalScrollViewType = require('InternalScrollViewType');
2323
const createReactClass = require('create-react-class');
2424
const dismissKeyboard = require('dismissKeyboard');
2525
const flattenStyle = require('flattenStyle');
26-
const invariant = require('fbjs/lib/invariant');
26+
const invariant = require('invariant');
2727
const processDecelerationRate = require('processDecelerationRate');
2828
const requireNativeComponent = require('requireNativeComponent');
2929
const resolveAssetSource = require('resolveAssetSource');

Libraries/Components/TextInput/TextInput.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
2626
const UIManager = require('UIManager');
2727

2828
const createReactClass = require('create-react-class');
29-
const invariant = require('fbjs/lib/invariant');
29+
const invariant = require('invariant');
3030
const requireNativeComponent = require('requireNativeComponent');
3131
const warning = require('fbjs/lib/warning');
3232

Libraries/Components/Touchable/PooledClass.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const invariant = require('fbjs/lib/invariant');
13+
const invariant = require('invariant');
1414

1515
/**
1616
* Static poolers. Several custom versions for each potential number of

Libraries/Components/Touchable/ensureComponentIsNative.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const invariant = require('fbjs/lib/invariant');
13+
const invariant = require('invariant');
1414

1515
const ensureComponentIsNative = function(component: any) {
1616
invariant(

Libraries/Components/Touchable/ensurePositiveDelayProps.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const invariant = require('fbjs/lib/invariant');
13+
const invariant = require('invariant');
1414

1515
const ensurePositiveDelayProps = function(props: any) {
1616
invariant(

Libraries/Components/View/View.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const React = require('React');
1414
const TextAncestor = require('TextAncestor');
1515
const ViewNativeComponent = require('ViewNativeComponent');
1616

17-
const invariant = require('fbjs/lib/invariant');
17+
const invariant = require('invariant');
1818

1919
import type {ViewProps} from 'ViewPropTypes';
2020

Libraries/Components/WebView/WebView.ios.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const View = require('View');
2424
const WebViewShared = require('WebViewShared');
2525

2626
const deprecatedPropType = require('deprecatedPropType');
27-
const invariant = require('fbjs/lib/invariant');
27+
const invariant = require('invariant');
2828
const keyMirror = require('fbjs/lib/keyMirror');
2929
const processDecelerationRate = require('processDecelerationRate');
3030
const requireNativeComponent = require('requireNativeComponent');

Libraries/Core/Timers/JSTimers.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
const Platform = require('Platform');
1313
const Systrace = require('Systrace');
1414

15-
const invariant = require('fbjs/lib/invariant');
15+
const invariant = require('invariant');
1616
const {Timing} = require('NativeModules');
1717
const BatchedBridge = require('BatchedBridge');
1818

Libraries/DeprecatedPropTypes/deprecatedCreateStrictShapeTypeChecker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const invariant = require('fbjs/lib/invariant');
13+
const invariant = require('invariant');
1414
const merge = require('merge');
1515

1616
function deprecatedCreateStrictShapeTypeChecker(shapeTypes: {

Libraries/EventEmitter/MissingNativeEventEmitterShim.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
const EmitterSubscription = require('EmitterSubscription');
1414
const EventEmitter = require('EventEmitter');
1515

16-
const invariant = require('fbjs/lib/invariant');
16+
const invariant = require('invariant');
1717

1818
class MissingNativeEventEmitterShim extends EventEmitter {
1919
isAvailable: boolean = false;

Libraries/EventEmitter/NativeEventEmitter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const EventEmitter = require('EventEmitter');
1414
const Platform = require('Platform');
1515
const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
1616

17-
const invariant = require('fbjs/lib/invariant');
17+
const invariant = require('invariant');
1818

1919
import type EmitterSubscription from 'EmitterSubscription';
2020

Libraries/Experimental/WindowedListView.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const ViewabilityHelper = require('ViewabilityHelper');
2222
const clamp = require('clamp');
2323
const deepDiffer = require('deepDiffer');
2424
const infoLog = require('infoLog');
25-
const invariant = require('fbjs/lib/invariant');
25+
const invariant = require('invariant');
2626
const nullthrows = require('nullthrows');
2727

2828
import type {NativeMethodsMixinType} from 'ReactNativeTypes';

Libraries/Geolocation/Geolocation.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
const NativeEventEmitter = require('NativeEventEmitter');
1414
const RCTLocationObserver = require('NativeModules').LocationObserver;
1515

16-
const invariant = require('fbjs/lib/invariant');
16+
const invariant = require('invariant');
1717
const logError = require('logError');
1818
/* $FlowFixMe(>=0.54.0 site=react_native_oss) This comment suppresses an error
1919
* found when Flow v0.54 was deployed. To see the error delete this comment and

Libraries/Image/AssetSourceResolver.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const PixelRatio = require('PixelRatio');
2323
const Platform = require('Platform');
2424

2525
const assetPathUtils = require('../../local-cli/bundle/assetPathUtils');
26-
const invariant = require('fbjs/lib/invariant');
26+
const invariant = require('invariant');
2727

2828
/**
2929
* Returns a path like 'assets/AwesomeModule/[email protected]'

Libraries/Inspector/Inspector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const Touchable = require('Touchable');
2121
const UIManager = require('UIManager');
2222
const View = require('View');
2323

24-
const invariant = require('fbjs/lib/invariant');
24+
const invariant = require('invariant');
2525

2626
export type ReactRenderer = {
2727
getInspectorDataForViewTag: (viewTag: number) => Object,

Libraries/Interaction/FrameRateLogger.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
const NativeModules = require('NativeModules');
1414

15-
const invariant = require('fbjs/lib/invariant');
15+
const invariant = require('invariant');
1616

1717
/**
1818
* Flow API for native FrameRateLogger module. If the native module is not installed, function calls

Libraries/Interaction/InteractionManager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const EventEmitter = require('EventEmitter');
1515
const TaskQueue = require('TaskQueue');
1616

1717
const infoLog = require('infoLog');
18-
const invariant = require('fbjs/lib/invariant');
18+
const invariant = require('invariant');
1919
const keyMirror = require('fbjs/lib/keyMirror');
2020

2121
type Handle = number;

Libraries/Interaction/TaskQueue.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
'use strict';
1212

1313
const infoLog = require('infoLog');
14-
const invariant = require('fbjs/lib/invariant');
14+
const invariant = require('invariant');
1515

1616
type SimpleTask = {
1717
name: string,

Libraries/Linking/Linking.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const NativeEventEmitter = require('NativeEventEmitter');
1414
const NativeModules = require('NativeModules');
1515
const Platform = require('Platform');
1616

17-
const invariant = require('fbjs/lib/invariant');
17+
const invariant = require('invariant');
1818

1919
const LinkingManager =
2020
Platform.OS === 'android'

Libraries/Lists/FlatList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const View = require('View');
1515
const VirtualizedList = require('VirtualizedList');
1616
const StyleSheet = require('StyleSheet');
1717

18-
const invariant = require('fbjs/lib/invariant');
18+
const invariant = require('invariant');
1919

2020
import type {ViewStyleProp} from 'StyleSheet';
2121
import type {

Libraries/Lists/ListView/ListView.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ const ListView = createReactClass({
427427
);
428428
continue;
429429
} else {
430-
const invariant = require('fbjs/lib/invariant');
430+
const invariant = require('invariant');
431431
invariant(
432432
this.props.enableEmptySections,
433433
"In next release 'enableEmptySections' flag will be deprecated, empty section headers will always be rendered." +

0 commit comments

Comments
 (0)