Skip to content

Commit 135277a

Browse files
iwoplazafacebook-github-bot
authored andcommitted
Migrate AppState and BatchedBridge files to use export syntax. (#48737)
Summary: Pull Request resolved: #48737 ## Motivation Modernising the react-native codebase to allow for ingestion by modern Flow tooling. ## This diff - Updates files in Libraries/AppState and Libraries/BatchedBridge to use `export` syntax - `export default` for qualified objects, many `export` statements for collections (determined by how it's imported) - Appends `.default` to requires of the changed files. - Updates Jest mocks. - Updates the public API snapshot (intented breaking change) Changelog: [General][Breaking] - Files inside `Libraries/BatchedBridge` and `Libraries/AppState` use `export` syntax, which requires the addition of `.default` when imported with the CJS `require` syntax. Reviewed By: robhogan Differential Revision: D68275767 fbshipit-source-id: 97dc84c04a8dd9c9022e53fc4595302efc848338
1 parent d9a77e1 commit 135277a

File tree

25 files changed

+266
-236
lines changed

25 files changed

+266
-236
lines changed

packages/react-native/Libraries/AppState/AppState.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,4 @@ class AppState {
125125
}
126126
}
127127

128-
module.exports = (new AppState(): AppState);
128+
export default (new AppState(): AppState);

packages/react-native/Libraries/BatchedBridge/BatchedBridge.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
'use strict';
1212

13-
const MessageQueue = require('./MessageQueue');
13+
import typeof MessageQueueT from './MessageQueue';
14+
15+
const MessageQueue: MessageQueueT = require('./MessageQueue').default;
1416

1517
const BatchedBridge: MessageQueue = new MessageQueue();
1618

@@ -25,4 +27,4 @@ Object.defineProperty(global, '__fbBatchedBridge', {
2527
value: BatchedBridge,
2628
});
2729

28-
module.exports = BatchedBridge;
30+
export default BatchedBridge;

packages/react-native/Libraries/BatchedBridge/MessageQueue.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,4 +489,4 @@ class MessageQueue {
489489
}
490490
}
491491

492-
module.exports = MessageQueue;
492+
export default MessageQueue;

packages/react-native/Libraries/BatchedBridge/NativeModules.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import type {ExtendedError} from '../Core/ExtendedError';
1414

15-
const BatchedBridge = require('./BatchedBridge');
15+
const BatchedBridge = require('./BatchedBridge').default;
1616
const invariant = require('invariant');
1717

1818
export type ModuleConfig = [
@@ -209,4 +209,4 @@ if (global.nativeModuleProxy) {
209209
);
210210
}
211211

212-
module.exports = NativeModules;
212+
export default NativeModules;

packages/react-native/Libraries/BatchedBridge/__tests__/MessageQueue-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const assertQueue = (flushedQueue, index, moduleID, methodID, params) => {
3333
describe('MessageQueue', function () {
3434
beforeEach(function () {
3535
jest.resetModules();
36-
MessageQueue = require('../MessageQueue');
36+
MessageQueue = require('../MessageQueue').default;
3737
MessageQueueTestModule = require('../__mocks__/MessageQueueTestModule');
3838
queue = new MessageQueue();
3939
queue.registerCallableModule(

packages/react-native/Libraries/BatchedBridge/__tests__/NativeModules-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ describe('MessageQueue', function () {
4141
jest.resetModules();
4242

4343
global.__fbBatchedBridgeConfig = require('../__mocks__/MessageQueueTestConfig');
44-
BatchedBridge = require('../BatchedBridge');
45-
NativeModules = require('../NativeModules');
44+
BatchedBridge = require('../BatchedBridge').default;
45+
NativeModules = require('../NativeModules').default;
4646
});
4747

4848
it('should generate native modules', () => {

packages/react-native/Libraries/Blob/__tests__/Blob-test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
'use strict';
1212

1313
jest.setMock('../../BatchedBridge/NativeModules', {
14-
BlobModule: require('../__mocks__/BlobModule'),
14+
__esModule: true,
15+
default: {
16+
BlobModule: require('../__mocks__/BlobModule'),
17+
},
1518
});
1619

1720
const Blob = require('../Blob');

packages/react-native/Libraries/Blob/__tests__/BlobManager-test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
'use strict';
1212

1313
jest.setMock('../../BatchedBridge/NativeModules', {
14-
BlobModule: require('../__mocks__/BlobModule'),
14+
__esModule: true,
15+
default: {
16+
BlobModule: require('../__mocks__/BlobModule'),
17+
},
1518
});
1619

1720
const Blob = require('../Blob');

packages/react-native/Libraries/Blob/__tests__/File-test.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
'use strict';
1212

1313
jest.setMock('../../BatchedBridge/NativeModules', {
14-
BlobModule: require('../__mocks__/BlobModule'),
14+
__esModule: true,
15+
default: {
16+
BlobModule: require('../__mocks__/BlobModule'),
17+
},
1518
});
1619

1720
const Blob = require('../Blob');

packages/react-native/Libraries/Blob/__tests__/FileReader-test.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111
'use strict';
1212

1313
jest.unmock('event-target-shim').setMock('../../BatchedBridge/NativeModules', {
14-
BlobModule: require('../__mocks__/BlobModule'),
15-
FileReaderModule: require('../__mocks__/FileReaderModule'),
14+
__esModule: true,
15+
default: {
16+
BlobModule: require('../__mocks__/BlobModule'),
17+
FileReaderModule: require('../__mocks__/FileReaderModule'),
18+
},
1619
});
1720

1821
const Blob = require('../Blob');

0 commit comments

Comments
 (0)