Move commons into /app (#2486)

* stash * move commons into the app
invertase · Aug 14, 2019 · b40d44c · b40d44c
1 parent 800ee77
commit b40d44c
Show file tree

Hide file tree

Showing 122 changed files with 242 additions and 453 deletions.
diff --git a/packages/admob/lib/AdsConsent.js b/packages/admob/lib/AdsConsent.js
@@ -15,7 +15,6 @@
  *
  */
 
-import { NativeModules } from 'react-native';
 import {
   hasOwnProperty,
   isArray,
@@ -24,8 +23,8 @@ import {
   isString,
   isUndefined,
   isValidUrl,
-} from '@react-native-firebase/common';
-
+} from '@react-native-firebase/app/lib/common';
+import { NativeModules } from 'react-native';
 import AdsConsentDebugGeography from './AdsConsentDebugGeography';
 import AdsConsentStatus from './AdsConsentStatus';
 

diff --git a/packages/admob/lib/ads/InterstitialAd.js b/packages/admob/lib/ads/InterstitialAd.js
@@ -15,11 +15,10 @@
  *
  */
 
-import { isFunction, isString } from '@react-native-firebase/common';
+import { isFunction, isString } from '@react-native-firebase/app/lib/common';
 import { getFirebaseRoot } from '@react-native-firebase/app/lib/internal';
 import validateAdRequestOptions from '../validateAdRequestOptions';
 import validateAdShowOptions from '../validateAdShowOptions';
-
 import MobileAd from './MobileAd';
 
 let _interstitialRequest = 0;

diff --git a/packages/admob/lib/ads/RewardedAd.js b/packages/admob/lib/ads/RewardedAd.js
@@ -15,12 +15,11 @@
  *
  */
 
-import { isFunction, isString } from '@react-native-firebase/common';
+import { isFunction, isString } from '@react-native-firebase/app/lib/common';
 import { getFirebaseRoot } from '@react-native-firebase/app/lib/internal';
 import validateAdRequestOptions from '../validateAdRequestOptions';
-
-import MobileAd from './MobileAd';
 import validateAdShowOptions from '../validateAdShowOptions';
+import MobileAd from './MobileAd';
 
 let _rewardedRequest = 0;
 

diff --git a/packages/admob/lib/index.js b/packages/admob/lib/index.js
@@ -20,17 +20,14 @@ import {
   FirebaseModule,
   getFirebaseRoot,
 } from '@react-native-firebase/app/lib/internal';
-
-import version from './version';
+import AdEventType from './AdEventType';
 import AdsConsentDebugGeography from './AdsConsentDebugGeography';
 import AdsConsentStatus from './AdsConsentStatus';
 import MaxAdContentRating from './MaxAdContentRating';
-import TestIds from './TestIds';
-
-import AdEventType from './AdEventType';
 import RewardedAdEventType from './RewardedAdEventType';
-
+import TestIds from './TestIds';
 import validateAdRequestConfiguration from './validateAdRequestConfiguration';
+import version from './version';
 
 const statics = {
   AdsConsentDebugGeography,
@@ -101,9 +98,7 @@ export MaxAdContentRating from './MaxAdContentRating';
 export TestIds from './TestIds';
 export AdEventType from './AdEventType';
 export RewardedAdEventType from './RewardedAdEventType';
-
 export AdsConsent from './AdsConsent';
-
 export InterstitialAd from './ads/InterstitialAd';
 export RewardedAd from './ads/RewardedAd';
 export BannerAd from './ads/BannerAd';
diff --git a/packages/admob/lib/validateAdRequestConfiguration.js b/packages/admob/lib/validateAdRequestConfiguration.js
@@ -15,8 +15,7 @@
  *
  */
 
-import { hasOwnProperty, isBoolean, isObject, isUndefined } from '@react-native-firebase/common';
-
+import { hasOwnProperty, isBoolean, isObject } from '@react-native-firebase/app/lib/common';
 import MaxAdContentRating from './MaxAdContentRating';
 
 export default function validateAdRequestConfiguration(requestConfiguration) {

diff --git a/packages/admob/lib/validateAdRequestOptions.js b/packages/admob/lib/validateAdRequestOptions.js
@@ -24,7 +24,7 @@ import {
   isString,
   isUndefined,
   isValidUrl,
-} from '@react-native-firebase/common';
+} from '@react-native-firebase/app/lib/common';
 
 export default function validateAdRequestOptions(options) {
   const out = {};

diff --git a/packages/admob/lib/validateAdShowOptions.js b/packages/admob/lib/validateAdShowOptions.js
@@ -15,7 +15,12 @@
  *
  */
 
-import { hasOwnProperty, isBoolean, isObject, isUndefined } from '@react-native-firebase/common';
+import {
+  hasOwnProperty,
+  isBoolean,
+  isObject,
+  isUndefined,
+} from '@react-native-firebase/app/lib/common';
 
 export default function validateAdShowOptions(options) {
   const out = {};

diff --git a/packages/admob/package.json b/packages/admob/package.json
@@ -25,8 +25,7 @@
     "@react-native-firebase/app": "*"
   },
   "dependencies": {
-    "@react-native-firebase/app-types": "0.2.3",
-    "@react-native-firebase/common": "0.2.3"
+    "@react-native-firebase/app-types": "0.2.3"
   },
   "gitHead": "889bf5379c8ce5257b33fb3ad1ac9c905fe26fff",
   "publishConfig": {

diff --git a/packages/analytics/lib/index.d.ts b/packages/analytics/lib/index.d.ts
@@ -16,7 +16,6 @@
  */
 
 import { ReactNativeFirebase } from '@react-native-firebase/app';
-import { Invites } from '@react-native-firebase/invites';
 
 /**
  * Firebase Analytics package for React Native.

diff --git a/packages/analytics/lib/index.js b/packages/analytics/lib/index.js
@@ -15,20 +15,19 @@
  *
  */
 
-import {
-  createModuleNamespace,
-  FirebaseModule,
-  getFirebaseRoot,
-} from '@react-native-firebase/app/lib/internal';
 import {
   isAlphaNumericUnderscore,
   isNull,
   isObject,
   isOneOf,
   isString,
   isUndefined,
-} from '@react-native-firebase/common';
-
+} from '@react-native-firebase/app/lib/common';
+import {
+  createModuleNamespace,
+  FirebaseModule,
+  getFirebaseRoot,
+} from '@react-native-firebase/app/lib/internal';
 import version from './version';
 
 const ReservedEventNames = [

diff --git a/packages/analytics/package.json b/packages/analytics/package.json
@@ -25,8 +25,7 @@
     "@react-native-firebase/app": "*"
   },
   "dependencies": {
-    "@react-native-firebase/app-types": "0.2.3",
-    "@react-native-firebase/common": "0.2.3"
+    "@react-native-firebase/app-types": "0.2.3"
   },
   "gitHead": "889bf5379c8ce5257b33fb3ad1ac9c905fe26fff",
   "publishConfig": {

diff --git a/packages/common/lib/Base64.js → packages/app/lib/common/Base64.js b/packages/common/lib/Base64.js → packages/app/lib/common/Base64.js
@@ -24,7 +24,7 @@ const CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=
 /**
  * window.btoa
  */
-function btoa(input): string {
+function btoa(input) {
   let map;
   let i = 0;
   let block = 0;
@@ -52,7 +52,7 @@ function btoa(input): string {
 /**
  * window.atob
  */
-function atob(input): string {
+function atob(input) {
   let i = 0;
   let bc = 0;
   let bs = 0;

diff --git a/packages/common/lib/MutatableParams.js → packages/app/lib/common/MutatableParams.js b/packages/common/lib/MutatableParams.js → packages/app/lib/common/MutatableParams.js
diff --git a/packages/common/lib/ReferenceBase.js → packages/app/lib/common/ReferenceBase.js b/packages/common/lib/ReferenceBase.js → packages/app/lib/common/ReferenceBase.js
diff --git a/packages/common/lib/deeps.js → packages/app/lib/common/deeps.js b/packages/common/lib/deeps.js → packages/app/lib/common/deeps.js
diff --git a/packages/common/lib/id.js → packages/app/lib/common/id.js b/packages/common/lib/id.js → packages/app/lib/common/id.js
diff --git a/packages/common/lib/index.js → packages/app/lib/common/index.js b/packages/common/lib/index.js → packages/app/lib/common/index.js
@@ -15,13 +15,14 @@
  *
  */
 import { Platform } from 'react-native';
-import { isString } from './validate';
 import Base64 from './Base64';
+import { isString } from './validate';
 
 export * from './id';
 export * from './path';
-export * from './validate';
 export * from './promise';
+export * from './validate';
+
 export Base64 from './Base64';
 export ReferenceBase from './ReferenceBase';
 

diff --git a/packages/common/lib/path.js → packages/app/lib/common/path.js b/packages/common/lib/path.js → packages/app/lib/common/path.js
diff --git a/packages/common/lib/promise.js → packages/app/lib/common/promise.js b/packages/common/lib/promise.js → packages/app/lib/common/promise.js
diff --git a/packages/common/lib/serialize.js → packages/app/lib/common/serialize.js b/packages/common/lib/serialize.js → packages/app/lib/common/serialize.js
diff --git a/packages/common/lib/validate.js → packages/app/lib/common/validate.js b/packages/common/lib/validate.js → packages/app/lib/common/validate.js
diff --git a/packages/app/lib/internal/FirebaseModule.js b/packages/app/lib/internal/FirebaseModule.js
@@ -15,7 +15,7 @@
  *
  */
 
-import { getNativeModule, getAppModule } from './registry/nativeModule';
+import { getAppModule, getNativeModule } from './registry/nativeModule';
 import SharedEventEmitter from './SharedEventEmitter';
 
 let firebaseJson = null;

diff --git a/packages/app/lib/internal/RNFBNativeEventEmitter.js b/packages/app/lib/internal/RNFBNativeEventEmitter.js
@@ -15,7 +15,7 @@
  *
  */
 
-import { NativeModules, NativeEventEmitter } from 'react-native';
+import { NativeEventEmitter, NativeModules } from 'react-native';
 
 const { RNFBAppModule } = NativeModules;
 

diff --git a/packages/app/lib/internal/index.js b/packages/app/lib/internal/index.js
@@ -15,11 +15,11 @@
  *
  */
 
+export { default as FirebaseApp } from '../FirebaseApp';
 export * from './constants';
+export { default as FirebaseModule } from './FirebaseModule';
+export { default as NativeFirebaseError } from './NativeFirebaseError';
 export * from './registry/app';
 export * from './registry/namespace';
 export * from './registry/nativeModule';
-export { default as FirebaseApp } from '../FirebaseApp';
-export { default as FirebaseModule } from './FirebaseModule';
 export { default as SharedEventEmitter } from './SharedEventEmitter';
-export { default as NativeFirebaseError } from './NativeFirebaseError';
diff --git a/packages/app/lib/internal/registry/app.js b/packages/app/lib/internal/registry/app.js
@@ -15,11 +15,10 @@
  *
  */
 
-import { isObject, isNull, isString, isUndefined } from '@react-native-firebase/common';
-
+import { isNull, isObject, isString, isUndefined } from '@react-native-firebase/app/lib/common';
 import FirebaseApp from '../../FirebaseApp';
-import { getAppModule } from './nativeModule';
 import { DEFAULT_APP_NAME } from '../constants';
+import { getAppModule } from './nativeModule';
 
 const APP_REGISTRY = {};
 let onAppCreateFn = null;

diff --git a/packages/app/lib/internal/registry/namespace.js b/packages/app/lib/internal/registry/namespace.js
@@ -15,13 +15,12 @@
  *
  */
 
-import { isString } from '@react-native-firebase/common';
-
-import SDK_VERSION from '../../version';
+import { isString } from '@react-native-firebase/app/lib/common';
 import FirebaseApp from '../../FirebaseApp';
+import SDK_VERSION from '../../version';
+import { DEFAULT_APP_NAME, KNOWN_NAMESPACES } from '../constants';
 import FirebaseModule from '../FirebaseModule';
 import { getApp, getApps, initializeApp, setOnAppCreate, setOnAppDestroy } from './app';
-import { KNOWN_NAMESPACES, DEFAULT_APP_NAME } from '../constants';
 
 // firebase.X
 let FIREBASE_ROOT = null;

diff --git a/packages/app/lib/internal/registry/nativeModule.js b/packages/app/lib/internal/registry/nativeModule.js
@@ -16,11 +16,10 @@
  */
 
 import { NativeModules, Platform } from 'react-native';
-
 import { APP_NATIVE_MODULE } from '../constants';
-import SharedEventEmitter from '../SharedEventEmitter';
 import NativeFirebaseError from '../NativeFirebaseError';
 import RNFBNativeEventEmitter from '../RNFBNativeEventEmitter';
+import SharedEventEmitter from '../SharedEventEmitter';
 
 const NATIVE_MODULE_REGISTRY = {};
 const NATIVE_MODULE_EVENT_SUBSCRIPTIONS = {};

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -54,7 +54,6 @@
   },
   "dependencies": {
     "@react-native-firebase/app-types": "0.2.3",
-    "@react-native-firebase/common": "0.2.3",
     "opencollective-postinstall": "^2.0.1"
   },
   "collective": {

diff --git a/packages/auth/lib/PhoneAuthListener.js b/packages/auth/lib/PhoneAuthListener.js
@@ -15,7 +15,7 @@
  *
  */
 
-import { promiseDefer, isFunction, isAndroid, isIOS } from '@react-native-firebase/common';
+import { isAndroid, isFunction, isIOS, promiseDefer } from '@react-native-firebase/app/lib/common';
 
 let REQUEST_ID = 0;
 

diff --git a/packages/auth/lib/Settings.js b/packages/auth/lib/Settings.js
@@ -15,7 +15,7 @@
  *
  */
 
-import { isAndroid, isIOS } from '@react-native-firebase/common';
+import { isAndroid, isIOS } from '@react-native-firebase/app/lib/common';
 
 export default class Settings {
   constructor(auth) {

diff --git a/packages/auth/lib/User.js b/packages/auth/lib/User.js
@@ -15,7 +15,7 @@
  *
  */
 
-import { isObject, isString } from '@react-native-firebase/common';
+import { isObject, isString } from '@react-native-firebase/app/lib/common';
 
 export default class User {
   constructor(auth, user) {

diff --git a/packages/auth/lib/index.js b/packages/auth/lib/index.js
@@ -15,27 +15,24 @@
  *
  */
 
+import { isAndroid, isBoolean } from '@react-native-firebase/app/lib/common';
 import {
   createModuleNamespace,
   FirebaseModule,
   getFirebaseRoot,
 } from '@react-native-firebase/app/lib/internal';
-
-import { isAndroid, isBoolean } from '@react-native-firebase/common';
-
+import ConfirmationResult from './ConfirmationResult';
+import PhoneAuthListener from './PhoneAuthListener';
 import EmailAuthProvider from './providers/EmailAuthProvider';
-import PhoneAuthProvider from './providers/PhoneAuthProvider';
-import GoogleAuthProvider from './providers/GoogleAuthProvider';
+import FacebookAuthProvider from './providers/FacebookAuthProvider';
 import GithubAuthProvider from './providers/GithubAuthProvider';
+import GoogleAuthProvider from './providers/GoogleAuthProvider';
 import OAuthProvider from './providers/OAuthProvider';
+import PhoneAuthProvider from './providers/PhoneAuthProvider';
 import TwitterAuthProvider from './providers/TwitterAuthProvider';
-import FacebookAuthProvider from './providers/FacebookAuthProvider';
-
+import Settings from './Settings';
 import User from './User';
 import version from './version';
-import Settings from './Settings';
-import PhoneAuthListener from './PhoneAuthListener';
-import ConfirmationResult from './ConfirmationResult';
 
 const statics = {
   EmailAuthProvider,

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -25,8 +25,7 @@
     "@react-native-firebase/app": "*"
   },
   "dependencies": {
-    "@react-native-firebase/app-types": "0.2.3",
-    "@react-native-firebase/common": "0.2.3"
+    "@react-native-firebase/app-types": "0.2.3"
   },
   "gitHead": "889bf5379c8ce5257b33fb3ad1ac9c905fe26fff",
   "publishConfig": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
      */
     import { ReactNativeFirebase } from '@react-native-firebase/app';
-    import { Invites } from '@react-native-firebase/invites';
     /**
      * Firebase Analytics package for React Native.
@@ Expand Down @@