Skip to content

Commit 1dd1b1d

Browse files
dplewisdplewis
authored
refactor: Remove module.exports in favor of export default (#2499)
1 parent 069740c commit 1dd1b1d

Some content is hidden

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

64 files changed

+230
-186
lines changed

‎integration/test/ParseLocalDatastoreTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function runTest(controller) {
2929

3030
describe(`Parse Object Pinning (${controller.name})`, () => {
3131
beforeEach(async () => {
32-
const StorageController = require(controller.file);
32+
const StorageController = require(controller.file).default;
3333
Parse.CoreManager.setAsyncStorage(mockRNStorage);
3434
Parse.CoreManager.setLocalDatastoreController(StorageController);
3535
Parse.CoreManager.setEventEmitter(require('events').EventEmitter);
@@ -1073,7 +1073,7 @@ function runTest(controller) {
10731073

10741074
describe(`Parse Query Pinning (${controller.name})`, () => {
10751075
beforeEach(async () => {
1076-
const StorageController = require(controller.file);
1076+
const StorageController = require(controller.file).default;
10771077
Parse.CoreManager.setAsyncStorage(mockRNStorage);
10781078
Parse.CoreManager.setLocalDatastoreController(StorageController);
10791079
Parse.CoreManager.setEventEmitter(require('events').EventEmitter);

‎integration/test/ParseReactNativeTest.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
const Parse = require('../../react-native');
44
const { resolvingPromise } = require('../../lib/react-native/promiseUtils');
5-
const CryptoController = require('../../lib/react-native/CryptoController');
6-
const LocalDatastoreController = require('../../lib/react-native/LocalDatastoreController.default');
7-
const StorageController = require('../../lib/react-native/StorageController.default');
8-
const RESTController = require('../../lib/react-native/RESTController');
5+
const CryptoController = require('../../lib/react-native/CryptoController').default;
6+
const LocalDatastoreController =
7+
require('../../lib/react-native/LocalDatastoreController.default').default;
8+
const StorageController = require('../../lib/react-native/StorageController.default').default;
9+
const RESTController = require('../../lib/react-native/RESTController').default;
910

1011
RESTController._setXHR(require('xmlhttprequest').XMLHttpRequest);
1112

‎src/CoreManager.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,5 +721,4 @@ const CoreManager = {
721721
},
722722
};
723723

724-
module.exports = CoreManager;
725724
export default CoreManager;

‎src/CryptoController.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ const CryptoController = {
2222
},
2323
};
2424

25-
module.exports = CryptoController;
2625
export default CryptoController;

‎src/EventEmitter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ try {
1717
} catch (_) {
1818
// EventEmitter unavailable
1919
}
20-
module.exports = EventEmitter;
20+
2121
export default EventEmitter;

‎src/EventuallyQueue.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,5 +355,4 @@ const EventuallyQueue = {
355355
},
356356
};
357357

358-
module.exports = EventuallyQueue;
359358
export default EventuallyQueue;

‎src/IndexedDBStorageController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ if (typeof window !== 'undefined' && window.indexedDB) {
3434
// IndexedDB not supported
3535
IndexedDBStorageController = undefined;
3636
}
37-
module.exports = IndexedDBStorageController;
37+
3838
export default IndexedDBStorageController;

‎src/InstallationController.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,4 @@ const InstallationController = {
7777
},
7878
};
7979

80-
module.exports = InstallationController;
8180
export default InstallationController;

‎src/LocalDatastore.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ const LocalDatastore = {
387387
},
388388
};
389389

390-
module.exports = LocalDatastore;
391390
export default LocalDatastore;
392391

393392
CoreManager.setLocalDatastoreController(LocalDatastoreController);

‎src/LocalDatastoreController.default.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,4 @@ const LocalDatastoreController = {
6161
},
6262
};
6363

64-
module.exports = LocalDatastoreController;
6564
export default LocalDatastoreController;

‎src/LocalDatastoreController.react-native.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,4 @@ const LocalDatastoreController = {
8080
},
8181
};
8282

83-
module.exports = LocalDatastoreController;
8483
export default LocalDatastoreController;

‎src/LocalDatastoreController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ let LocalDatastoreController: any = DefaultLocalDatastoreController;
66
if (process.env.PARSE_BUILD === 'react-native') {
77
LocalDatastoreController = RNLocalDatastoreController;
88
}
9-
module.exports = LocalDatastoreController;
9+
1010
export default LocalDatastoreController;

‎src/OfflineQuery.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,5 +591,4 @@ const OfflineQuery = {
591591
validateQuery: validateQuery,
592592
};
593593

594-
module.exports = OfflineQuery;
595594
export default OfflineQuery;

‎src/ParseInstallation.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,5 +286,4 @@ class ParseInstallation<T extends Attributes = Attributes> extends ParseObject<T
286286

287287
ParseObject.registerSubclass('_Installation', ParseInstallation);
288288

289-
module.exports = ParseInstallation;
290289
export default ParseInstallation;

‎src/RESTController.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,5 +361,4 @@ const RESTController = {
361361
},
362362
};
363363

364-
module.exports = RESTController;
365364
export default RESTController;

‎src/Socket.weapp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@ class SocketWeapp {
4949
wx.closeSocket();
5050
}
5151
}
52-
module.exports = SocketWeapp;
52+
5353
export default SocketWeapp;

‎src/Storage.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,4 @@ const Storage = {
9191
},
9292
};
9393

94-
module.exports = Storage;
9594
export default Storage;

‎src/StorageController.browser.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ const StorageController = {
3333
},
3434
};
3535

36-
module.exports = StorageController;
3736
export default StorageController;

‎src/StorageController.default.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ const StorageController = {
3131
},
3232
};
3333

34-
module.exports = StorageController;
3534
export default StorageController;

‎src/StorageController.react-native.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,4 @@ const StorageController = {
8080
},
8181
};
8282

83-
module.exports = StorageController;
8483
export default StorageController;

‎src/StorageController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ if (process.env.PARSE_BUILD === 'react-native') {
1212
} else if (process.env.PARSE_BUILD === 'weapp') {
1313
StorageController = WeappStorageController;
1414
}
15-
module.exports = StorageController;
15+
1616
export default StorageController;

‎src/StorageController.weapp.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ const StorageController = {
3232
},
3333
};
3434

35-
module.exports = StorageController;
3635
export default StorageController;

‎src/TaskQueue.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,4 @@ class TaskQueue {
5151
}
5252
}
5353

54-
module.exports = TaskQueue;
5554
export default TaskQueue;

‎src/WebSocketController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ try {
1818
} catch (_) {
1919
// WebSocket unavailable
2020
}
21-
module.exports = WebSocketController;
21+
2222
export default WebSocketController;

‎src/Xhr.weapp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,5 @@ class XhrWeapp {
107107
});
108108
}
109109
}
110-
module.exports = XhrWeapp;
110+
111111
export default XhrWeapp;

‎src/__tests__/Analytics-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jest.dontMock('../Analytics');
22
jest.dontMock('../CoreManager');
33

44
const Analytics = require('../Analytics');
5-
const CoreManager = require('../CoreManager');
5+
const CoreManager = require('../CoreManager').default;
66

77
const defaultController = CoreManager.getAnalyticsController();
88

‎src/__tests__/Cloud-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jest.dontMock('../Push');
99
jest.dontMock('../ParseOp');
1010

1111
const Cloud = require('../Cloud');
12-
const CoreManager = require('../CoreManager');
12+
const CoreManager = require('../CoreManager').default;
1313
const Push = require('../Push');
1414
require('../ParseOp');
1515

‎src/__tests__/CoreManager-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
jest.dontMock('../CoreManager');
22

3-
const CoreManager = require('../CoreManager');
3+
const CoreManager = require('../CoreManager').default;
44

55
describe('CoreManager', () => {
66
it('is initialized with default values', () => {

‎src/__tests__/EventuallyQueue-test.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,26 @@ class MockObject {
3434
return MockSubclass;
3535
}
3636
}
37-
jest.setMock('../ParseObject', MockObject);
37+
jest.setMock('../ParseObject', {
38+
__esModule: true,
39+
default: MockObject,
40+
});
3841

3942
const mockQueryFind = jest.fn();
40-
jest.mock('../ParseQuery', () => {
41-
return jest.fn().mockImplementation(function () {
43+
jest.mock('../ParseQuery', () => ({
44+
__esModule: true,
45+
default: jest.fn().mockImplementation(function () {
4246
this.equalTo = jest.fn();
4347
this.find = mockQueryFind;
44-
});
45-
});
48+
}),
49+
}));
4650
const mockRNStorageInterface = require('./test_helpers/mockRNStorage');
47-
const CoreManager = require('../CoreManager');
48-
const EventuallyQueue = require('../EventuallyQueue');
51+
const CoreManager = require('../CoreManager').default;
52+
const EventuallyQueue = require('../EventuallyQueue').default;
4953
const ParseError = require('../ParseError').default;
50-
const ParseObject = require('../ParseObject');
51-
const RESTController = require('../RESTController');
52-
const Storage = require('../Storage');
54+
const ParseObject = require('../ParseObject').default;
55+
const RESTController = require('../RESTController').default;
56+
const Storage = require('../Storage').default;
5357
const mockXHR = require('./test_helpers/mockXHR');
5458
const flushPromises = require('./test_helpers/flushPromises');
5559

@@ -65,7 +69,7 @@ describe('EventuallyQueue', () => {
6569
beforeEach(async () => {
6670
jest.clearAllMocks();
6771
CoreManager.setAsyncStorage(mockRNStorageInterface);
68-
CoreManager.setStorageController(require('../StorageController.react-native'));
72+
CoreManager.setStorageController(require('../StorageController.react-native').default);
6973
CoreManager.setRESTController(RESTController);
7074
EventuallyQueue.stopPoll();
7175
await EventuallyQueue.clear();

‎src/__tests__/Hooks-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jest.dontMock('../ParseObject');
77
jest.dontMock('../RESTController');
88

99
const Hooks = require('../ParseHooks');
10-
const CoreManager = require('../CoreManager');
11-
const RESTController = require('../RESTController');
10+
const CoreManager = require('../CoreManager').default;
11+
const RESTController = require('../RESTController').default;
1212

1313
const defaultController = CoreManager.getHooksController();
1414
const { sendRequest } = defaultController;

‎src/__tests__/InstallationController-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jest.mock('../uuid', () => {
1515
return () => value++ + '';
1616
});
1717

18-
const CoreManager = require('../CoreManager');
19-
const ParseInstallation = require('../ParseInstallation');
20-
const InstallationController = require('../InstallationController');
21-
const Storage = require('../Storage');
18+
const CoreManager = require('../CoreManager').default;
19+
const ParseInstallation = require('../ParseInstallation').default;
20+
const InstallationController = require('../InstallationController').default;
21+
const Storage = require('../Storage').default;
2222

23-
CoreManager.setStorageController(require('../StorageController.default'));
23+
CoreManager.setStorageController(require('../StorageController.default').default);
2424

2525
describe('InstallationController', () => {
2626
beforeEach(() => {

‎src/__tests__/LiveQueryClient-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ const mockLocalDatastore = {
3535
};
3636
jest.setMock('../LocalDatastore', mockLocalDatastore);
3737

38-
const CoreManager = require('../CoreManager');
39-
const EventEmitter = require('../EventEmitter');
38+
const CoreManager = require('../CoreManager').default;
39+
const EventEmitter = require('../EventEmitter').default;
4040
const LiveQueryClient = require('../LiveQueryClient').default;
4141
const ParseObject = require('../ParseObject').default;
4242
const ParseQuery = require('../ParseQuery').default;
43-
const WebSocketController = require('../WebSocketController');
43+
const WebSocketController = require('../WebSocketController').default;
4444
const { resolvingPromise } = require('../promiseUtils');
4545
const events = require('events');
4646

‎src/__tests__/LocalDatastore-test.js

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -78,30 +78,36 @@ const mockLocalStorageController = {
7878
getAllContents: jest.fn(),
7979
clear: jest.fn(),
8080
};
81-
jest.setMock('../ParseObject', MockObject);
81+
jest.setMock('../ParseObject', {
82+
__esModule: true,
83+
default: MockObject,
84+
});
8285

8386
const mockQueryFind = jest.fn();
84-
jest.mock('../ParseQuery', () => {
85-
return jest.fn().mockImplementation(function () {
87+
jest.mock('../ParseQuery', () => ({
88+
__esModule: true,
89+
default: jest.fn().mockImplementation(function () {
8690
this.equalTo = jest.fn();
8791
this.containedIn = jest.fn();
8892
this.limit = jest.fn();
8993
this.find = mockQueryFind;
90-
});
91-
});
94+
}),
95+
}));
9296

93-
const CoreManager = require('../CoreManager');
94-
const LocalDatastore = require('../LocalDatastore');
95-
const ParseObject = require('../ParseObject');
96-
const ParseQuery = require('../ParseQuery');
97+
const CoreManager = require('../CoreManager').default;
98+
const LocalDatastore = require('../LocalDatastore').default;
99+
const ParseObject = require('../ParseObject').default;
100+
const ParseQuery = require('../ParseQuery').default;
97101
const ParseUser = require('../ParseUser').default;
98-
const LocalDatastoreController = require('../LocalDatastoreController');
99-
const RNDatastoreController = require('../LocalDatastoreController.react-native');
100-
const BrowserStorageController = require('../StorageController.browser');
101-
const DefaultStorageController = require('../StorageController.default');
102+
const LocalDatastoreController = require('../LocalDatastoreController').default;
103+
const RNDatastoreController = require('../LocalDatastoreController.react-native').default;
104+
const BrowserStorageController = require('../StorageController.browser').default;
105+
const DefaultStorageController = require('../StorageController.default').default;
102106
// Register our mocks
103-
jest.spyOn(CoreManager, 'getParseObject').mockImplementation(() => require('../ParseObject'));
104-
jest.spyOn(CoreManager, 'getParseQuery').mockImplementation(() => require('../ParseQuery'));
107+
jest
108+
.spyOn(CoreManager, 'getParseObject')
109+
.mockImplementation(() => require('../ParseObject').default);
110+
jest.spyOn(CoreManager, 'getParseQuery').mockImplementation(() => require('../ParseQuery').default);
105111

106112
const item1 = new ParseObject('Item');
107113
const item2 = new ParseObject('Item');

‎src/__tests__/ObjectStateMutations-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ const mockObject = function (className) {
1313
};
1414
mockObject.registerSubclass = function () {};
1515
jest.setMock('../ParseObject', mockObject);
16-
const CoreManager = require('../CoreManager');
16+
const CoreManager = require('../CoreManager').default;
1717
CoreManager.setParseObject(mockObject);
1818

1919
const ObjectStateMutations = require('../ObjectStateMutations');
2020
const ParseOps = require('../ParseOp');
21-
const TaskQueue = require('../TaskQueue');
21+
const TaskQueue = require('../TaskQueue').default;
2222

2323
describe('ObjectStateMutations', () => {
2424
it('can apply server data', () => {

‎src/__tests__/OfflineQuery-test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
jest.autoMockOff();
22

3-
const matchesQuery = require('../OfflineQuery').matchesQuery;
4-
const validateQuery = require('../OfflineQuery').validateQuery;
3+
const { matchesQuery, validateQuery } = require('../OfflineQuery').default;
54
const ParseError = require('../ParseError').default;
65
const ParseObject = require('../ParseObject').default;
76
const ParseQuery = require('../ParseQuery').default;

‎src/__tests__/Parse-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jest.dontMock('crypto-js/aes');
1111
jest.setMock('../EventuallyQueue', { poll: jest.fn() });
1212

1313
global.indexedDB = require('./test_helpers/mockIndexedDB');
14-
const CoreManager = require('../CoreManager');
14+
const CoreManager = require('../CoreManager').default;
1515
const ParseLiveQuery = require('../ParseLiveQuery').default;
1616
const EventuallyQueue = require('../EventuallyQueue');
1717
const Parse = require('../Parse');

‎src/__tests__/ParseACL-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jest.setMock('../ParseRole', mockRole);
1313
const ParseACL = require('../ParseACL').default;
1414
const ParseUser = require('../ParseUser').default;
1515
const ParseRole = require('../ParseRole');
16-
const CoreManager = require('../CoreManager');
16+
const CoreManager = require('../CoreManager').default;
1717
CoreManager.setParseRole(require('../ParseRole'));
1818

1919
describe('ParseACL', () => {

0 commit comments

Comments
 (0)