Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

const LayoutAnimation =
require('../../../LayoutAnimation/LayoutAnimation').default;
const dismissKeyboard = require('../../../Utilities/dismissKeyboard');
const dismissKeyboard = require('../../../Utilities/dismissKeyboard').default;
const Keyboard = require('../Keyboard').default;

jest.mock('../../../LayoutAnimation/LayoutAnimation');
Expand Down
3 changes: 2 additions & 1 deletion packages/react-native/Libraries/Core/InitializeCore.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ if (__DEV__) {

require('../ReactNative/AppRegistry');

const GlobalPerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
const GlobalPerformanceLogger =
require('../Utilities/GlobalPerformanceLogger').default;
// We could just call GlobalPerformanceLogger.markPoint at the top of the file,
// but then we'd be excluding the time it took to require the logger.
// Instead, we just use Date.now and backdate the timestamp.
Expand Down
5 changes: 3 additions & 2 deletions packages/react-native/Libraries/Core/setUpBatchedBridge.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ registerModule(
'RCTNativeAppEventEmitter',
() => require('../EventEmitter/RCTNativeAppEventEmitter').default,
);
registerModule('GlobalPerformanceLogger', () =>
require('../Utilities/GlobalPerformanceLogger'),
registerModule(
'GlobalPerformanceLogger',
() => require('../Utilities/GlobalPerformanceLogger').default,
);

if (__DEV__) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import ProgressEvent from '../../src/private/webapis/xhr/events/ProgressEvent';
import {type EventSubscription} from '../vendor/emitter/EventEmitter';

const BlobManager = require('../Blob/BlobManager').default;
const GlobalPerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
const GlobalPerformanceLogger =
require('../Utilities/GlobalPerformanceLogger').default;
const RCTNetworking = require('./RCTNetworking').default;
const base64 = require('base64-js');
const invariant = require('invariant');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import {type EventSubscription} from '../vendor/emitter/EventEmitter';
import EventTarget from 'event-target-shim';

const BlobManager = require('../Blob/BlobManager').default;
const GlobalPerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
const GlobalPerformanceLogger =
require('../Utilities/GlobalPerformanceLogger').default;
const RCTNetworking = require('./RCTNetworking').default;
const base64 = require('base64-js');
const invariant = require('invariant');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

const createPerformanceLogger =
require('../../Utilities/createPerformanceLogger').default;
const GlobalPerformanceLogger = require('../../Utilities/GlobalPerformanceLogger');
const GlobalPerformanceLogger =
require('../../Utilities/GlobalPerformanceLogger').default;
const Platform = require('../../Utilities/Platform');
const XMLHttpRequest = require('../XMLHttpRequest').default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ import createPerformanceLogger from './createPerformanceLogger';
*/
const GlobalPerformanceLogger: IPerformanceLogger = createPerformanceLogger();

module.exports = GlobalPerformanceLogger;
export default GlobalPerformanceLogger;
2 changes: 1 addition & 1 deletion packages/react-native/Libraries/Utilities/SceneTracker.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ const SceneTracker = {
},
};

module.exports = SceneTracker;
export default SceneTracker;
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

const GlobalPerformanceLogger = jest
.unmock('../createPerformanceLogger')
.genMockFromModule('../GlobalPerformanceLogger');
.genMockFromModule('../GlobalPerformanceLogger').default;

module.exports = GlobalPerformanceLogger;
export default GlobalPerformanceLogger;
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'use strict';

const SceneTracker = require('../SceneTracker');
const SceneTracker = require('../SceneTracker').default;

describe('setActiveScene', function () {
it('can handle multiple listeners and unsubscribe', function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ function dismissKeyboard() {
TextInputState.blurTextInput(TextInputState.currentlyFocusedInput());
}

module.exports = dismissKeyboard;
export default dismissKeyboard;
Original file line number Diff line number Diff line change
Expand Up @@ -8156,7 +8156,7 @@ declare module.exports: {

exports[`public API should not change unintentionally Libraries/Utilities/GlobalPerformanceLogger.js 1`] = `
"declare const GlobalPerformanceLogger: IPerformanceLogger;
declare module.exports: GlobalPerformanceLogger;
declare export default typeof GlobalPerformanceLogger;
"
`;

Expand Down Expand Up @@ -8434,7 +8434,7 @@ declare const SceneTracker: {
...
},
};
declare module.exports: SceneTracker;
declare export default typeof SceneTracker;
"
`;

Expand Down Expand Up @@ -8555,7 +8555,7 @@ declare export default typeof sizesDiffer;

exports[`public API should not change unintentionally Libraries/Utilities/dismissKeyboard.js 1`] = `
"declare function dismissKeyboard(): void;
declare module.exports: dismissKeyboard;
declare export default typeof dismissKeyboard;
"
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import React from 'react';
const View = require('../../../Libraries/Components/View/View').default;
const StyleSheet = require('../../../Libraries/StyleSheet/StyleSheet').default;
const Text = require('../../../Libraries/Text/Text').default;
const PerformanceLogger = require('../../../Libraries/Utilities/GlobalPerformanceLogger');
const PerformanceLogger =
require('../../../Libraries/Utilities/GlobalPerformanceLogger').default;

class PerformanceOverlay extends React.Component<{...}> {
render(): React.Node {
Expand Down