From 2207b2d35146d78cbd3d8953f539f965faaa8ec7 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Fri, 21 Jun 2019 15:37:34 -0700 Subject: [PATCH 1/3] Roll back import of newer AsyncStorage (#1902) --- packages/app/index.rn.ts | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/packages/app/index.rn.ts b/packages/app/index.rn.ts index 0755bc7908a..2669b4a7ac8 100644 --- a/packages/app/index.rn.ts +++ b/packages/app/index.rn.ts @@ -24,19 +24,8 @@ import { createFirebaseNamespace } from './src/firebaseNamespace'; * some of our tests because of duplicate symbols, we are using require syntax * here */ -// eslint-disable-next-line @typescript-eslint/no-explicit-any -let AsyncStorage: any; - -try { - // eslint-disable-next-line @typescript-eslint/no-require-imports - AsyncStorage = require('@react-native-community/async-storage'); -} catch (e) { - if (e.code !== 'MODULE_NOT_FOUND') { - throw e; - } - // eslint-disable-next-line @typescript-eslint/no-require-imports - AsyncStorage = require('react-native').AsyncStorage; -} +// eslint-disable-next-line @typescript-eslint/no-require-imports +const { AsyncStorage } = require('react-native'); const _firebase = createFirebaseNamespace() as _FirebaseNamespace; From 4670d0018d83dd51850b7d4ca225bcb4f08f19ba Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Mon, 24 Jun 2019 11:43:22 -0700 Subject: [PATCH 2/3] Fix XMLHttpRequest import --- packages/app/index.node.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app/index.node.ts b/packages/app/index.node.ts index 25d71972fe6..d53335e88b3 100644 --- a/packages/app/index.node.ts +++ b/packages/app/index.node.ts @@ -21,8 +21,8 @@ import { createFirebaseNamespace } from './src/firebaseNamespace'; // Node specific packages. // @ts-ignore import Storage from 'dom-storage'; -// @ts-ignore -import XMLHttpRequest from 'xmlhttprequest'; +// @ts-ignore` +import { XMLHttpRequest } from 'xmlhttprequest'; const _firebase = createFirebaseNamespace() as _FirebaseNamespace; From ada5ec851ca939226ce53c2df0f0448f48c95b8a Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Mon, 24 Jun 2019 12:00:40 -0700 Subject: [PATCH 3/3] Remove extra character --- packages/app/index.node.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/index.node.ts b/packages/app/index.node.ts index d53335e88b3..12a396fa1f1 100644 --- a/packages/app/index.node.ts +++ b/packages/app/index.node.ts @@ -21,7 +21,7 @@ import { createFirebaseNamespace } from './src/firebaseNamespace'; // Node specific packages. // @ts-ignore import Storage from 'dom-storage'; -// @ts-ignore` +// @ts-ignore import { XMLHttpRequest } from 'xmlhttprequest'; const _firebase = createFirebaseNamespace() as _FirebaseNamespace;