Skip to content

Commit 6e01b2a

Browse files
authored
Roll back to 6.2.1 and add RN and XMLHttpRequest fixes (#1909)
Roll back import of newer AsyncStorage (#1902) and fix XMLHttpRequest import line
1 parent 6ae2cbf commit 6e01b2a

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

packages/app/index.node.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { createFirebaseNamespace } from './src/firebaseNamespace';
2222
// @ts-ignore
2323
import Storage from 'dom-storage';
2424
// @ts-ignore
25-
import XMLHttpRequest from 'xmlhttprequest';
25+
import { XMLHttpRequest } from 'xmlhttprequest';
2626

2727
const _firebase = createFirebaseNamespace() as _FirebaseNamespace;
2828

packages/app/index.rn.ts

+2-13
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,8 @@ import { createFirebaseNamespace } from './src/firebaseNamespace';
2424
* some of our tests because of duplicate symbols, we are using require syntax
2525
* here
2626
*/
27-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
28-
let AsyncStorage: any;
29-
30-
try {
31-
// eslint-disable-next-line @typescript-eslint/no-require-imports
32-
AsyncStorage = require('@react-native-community/async-storage');
33-
} catch (e) {
34-
if (e.code !== 'MODULE_NOT_FOUND') {
35-
throw e;
36-
}
37-
// eslint-disable-next-line @typescript-eslint/no-require-imports
38-
AsyncStorage = require('react-native').AsyncStorage;
39-
}
27+
// eslint-disable-next-line @typescript-eslint/no-require-imports
28+
const { AsyncStorage } = require('react-native');
4029

4130
const _firebase = createFirebaseNamespace() as _FirebaseNamespace;
4231

0 commit comments

Comments
 (0)