[types] Get types properly exporting as part of the build

chrisbianca · chrisbianca · commit fbe73f5dcb09 · 2017-11-17T16:17:27.000Z
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,16 @@
 {
-  "presets": ["react-native"]
+  "env": {
+    "development": {
+      "presets": ["react-native"],
+      "plugins": [
+        "transform-flow-strip-types"
+      ]
+    },
+    "publish": {
+      "presets": ["react-native-syntax"],
+      "plugins": [
+        "transform-flow-strip-types"
+      ]
+    }
+  }
 }
diff --git a/.flowconfig b/.flowconfig
@@ -73,11 +73,14 @@
 .*/node_modules/protobufjs/src/bower.json
 .*/node_modules/grpc/node_modules/protobufjs/src/bower.json
 
+# Ignore dist folder
+.*/dist/.*
+
 [include]
 node_modules/fbjs/lib
 
 [libs]
-lib/flow.js
+lib/types/flow.js
 node_modules/react-native/Libraries/react-native/react-native-interface.js
 node_modules/react-native/flow
 node_modules/fbjs/flow/lib
diff --git a/.gitignore b/.gitignore
@@ -76,4 +76,4 @@ local.properties
 
 **/ios/Pods/**
 **/ios/ReactNativeFirebaseDemo.xcworkspace/
-
+dist
diff --git a/index.js b/index.js
diff --git a/lib/index.d.ts b/lib/index.d.ts
diff --git a/lib/index.js b/lib/index.js
@@ -0,0 +1,8 @@
+/**
+ * @flow
+ */
+import Firebase from './modules/core/firebase';
+
+export const AdMob = require('./modules/admob');
+
+export default Firebase;
diff --git a/lib/modules/auth/PhoneAuthListener.js b/lib/modules/auth/PhoneAuthListener.js
@@ -1,5 +1,5 @@
 // @flow
-import INTERNALS from './../../internals';
+import INTERNALS from '../../utils/internals';
 import { generatePushID, isFunction, isAndroid, isIOS, isString, nativeToJSError } from './../../utils';
 
 import type Auth from './';
diff --git a/lib/modules/auth/User.js b/lib/modules/auth/User.js
@@ -2,7 +2,7 @@
  * @flow
  * User representation wrapper
  */
-import INTERNALS from './../../internals';
+import INTERNALS from '../../utils/internals';
 
 import type Auth from './';
 
diff --git a/lib/modules/auth/index.js b/lib/modules/auth/index.js
@@ -3,8 +3,8 @@
  * Auth representation wrapper
  */
 import User from './User';
-import ModuleBase from './../../utils/ModuleBase';
-import INTERNALS from './../../internals';
+import ModuleBase from '../../utils/ModuleBase';
+import INTERNALS from '../../utils/internals';
 import ConfirmationResult from './ConfirmationResult';
 
 // providers
@@ -17,7 +17,7 @@ import FacebookAuthProvider from './providers/FacebookAuthProvider';
 
 import PhoneAuthListener from './PhoneAuthListener';
 
-import type FirebaseApp from '../../firebase-app';
+import type FirebaseApp from '../core/firebase-app';
 
 export default class Auth extends ModuleBase {
   static _NAMESPACE = 'auth';
diff --git a/lib/modules/base.js b/lib/modules/base.js
diff --git a/lib/modules/core/firebase-app.js b/lib/modules/core/firebase-app.js
@@ -3,23 +3,21 @@
  */
 import { NativeModules } from 'react-native';
 
-import INTERNALS from './internals';
-import { isObject, isAndroid } from './utils';
-
-import AdMob, { statics as AdMobStatics } from './modules/admob';
-import Auth, { statics as AuthStatics } from './modules/auth';
-import Analytics from './modules/analytics';
-import Crash from './modules/crash';
-import Performance from './modules/perf';
-import RemoteConfig from './modules/config';
-import Storage, { statics as StorageStatics } from './modules/storage';
-import Database, { statics as DatabaseStatics } from './modules/database';
-import Messaging, { statics as MessagingStatics } from './modules/messaging';
-import Firestore, { statics as FirestoreStatics } from './modules/firestore';
-import Links, { statics as LinksStatics } from './modules/links';
-import Utils, { statics as UtilsStatics } from './modules/utils';
-
-import type { FirebaseOptions } from './firebase';
+import INTERNALS from '../../utils/internals';
+import { isObject, isAndroid } from '../../utils';
+
+import AdMob, { statics as AdMobStatics } from '../admob';
+import Auth, { statics as AuthStatics } from '../auth';
+import Analytics from '../analytics';
+import Crash from '../crash';
+import Performance from '../perf';
+import RemoteConfig from '../config';
+import Storage, { statics as StorageStatics } from '../storage';
+import Database, { statics as DatabaseStatics } from '../database';
+import Messaging, { statics as MessagingStatics } from '../messaging';
+import Firestore, { statics as FirestoreStatics } from '../firestore';
+import Links, { statics as LinksStatics } from '../links';
+import Utils, { statics as UtilsStatics } from '../utils';
 
 const FirebaseCoreModule = NativeModules.RNFirebase;
 
diff --git a/lib/modules/core/firebase.js b/lib/modules/core/firebase.js
@@ -4,23 +4,23 @@
  */
 import { NativeModules, NativeEventEmitter } from 'react-native';
 
-import INTERNALS from './internals';
+import INTERNALS from '../../utils/internals';
 import FirebaseApp from './firebase-app';
-import { isObject, isString } from './utils';
+import { isObject, isString } from '../../utils';
 
 // module imports
-import AdMob, { statics as AdMobStatics } from './modules/admob';
-import Auth, { statics as AuthStatics } from './modules/auth';
-import Analytics from './modules/analytics';
-import Crash from './modules/crash';
-import Performance from './modules/perf';
-import Links, { statics as LinksStatics } from './modules/links';
-import RemoteConfig from './modules/config';
-import Storage, { statics as StorageStatics } from './modules/storage';
-import Database, { statics as DatabaseStatics } from './modules/database';
-import Messaging, { statics as MessagingStatics } from './modules/messaging';
-import Firestore, { statics as FirestoreStatics } from './modules/firestore';
-import Utils, { statics as UtilsStatics } from './modules/utils';
+import AdMob, { statics as AdMobStatics } from '../admob';
+import Auth, { statics as AuthStatics } from '../auth';
+import Analytics from '../analytics';
+import Crash from '../crash';
+import Performance from '../perf';
+import Links, { statics as LinksStatics } from '../links';
+import RemoteConfig from '../config';
+import Storage, { statics as StorageStatics } from '../storage';
+import Database, { statics as DatabaseStatics } from '../database';
+import Messaging, { statics as MessagingStatics } from '../messaging';
+import Firestore, { statics as FirestoreStatics } from '../firestore';
+import Utils, { statics as UtilsStatics } from '../utils';
 
 const FirebaseCoreModule = NativeModules.RNFirebase;
 
diff --git a/lib/modules/database/reference.js b/lib/modules/database/reference.js
@@ -17,7 +17,7 @@ import {
   generatePushID,
 } from './../../utils';
 
-import INTERNALS from './../../internals';
+import INTERNALS from '../../utils/internals';
 
 // track all event registrations by path
 let listeners = 0;
diff --git a/lib/modules/firestore/index.js b/lib/modules/firestore/index.js
@@ -9,10 +9,10 @@ import FieldValue from './FieldValue';
 import GeoPoint from './GeoPoint';
 import Path from './Path';
 import WriteBatch from './WriteBatch';
-import INTERNALS from './../../internals';
+import INTERNALS from '../../utils/internals';
 
 import type DocumentSnapshot from './DocumentSnapshot';
-import type FirebaseApp from '../../firebase-app';
+import type FirebaseApp from '../core/firebase-app';
 import type QuerySnapshot from './QuerySnapshot';
 
 type CollectionSyncEvent = {
diff --git a/lib/modules/utils/index.js b/lib/modules/utils/index.js
@@ -3,9 +3,9 @@ import { NativeModules } from 'react-native';
 // import { version as ReactVersion } from 'react';
 // import ReactNativeVersion from 'react-native/Libraries/Core/ReactNativeVersion';
 
-import INTERNALS from './../../internals';
-import { isIOS } from './../../utils';
-import PACKAGE from './../../../package.json';
+import INTERNALS from '../../utils/internals';
+import { isIOS } from '../../utils';
+import PACKAGE from '../../../package.json';
 
 const FirebaseCoreModule = NativeModules.RNFirebase;
 
@@ -128,4 +128,3 @@ export const statics = {
   //   'react-native-firebase': PACKAGE.version,
   // },
 };
-
diff --git a/lib/types/flow.js b/lib/types/flow.js
diff --git a/lib/utils/ModuleBase.js b/lib/utils/ModuleBase.js
@@ -3,12 +3,12 @@
  */
 import { NativeModules } from 'react-native';
 
-import Log from '../utils/log';
-import INTERNALS from './../internals';
-import FirebaseCore from './../firebase';
-import { nativeWithApp } from './../utils';
+import Log from './log';
+import INTERNALS from './internals';
+import FirebaseCore from '../modules/core/firebase';
+import { nativeWithApp } from '../utils';
 
-import type FirebaseApp from '../firebase-app';
+import type FirebaseApp from '../modules/core/firebase-app';
 
 const logs = {};
 
diff --git a/lib/utils/internals.js b/lib/utils/internals.js
@@ -3,9 +3,9 @@
  */
 import { Platform, NativeModules } from 'react-native';
 
-import EventEmitter from './utils/emitter/EventEmitter';
-import ModuleBase from './utils/ModuleBase';
-import SyncTree from './utils/SyncTree';
+import EventEmitter from './emitter/EventEmitter';
+import ModuleBase from './ModuleBase';
+import SyncTree from './SyncTree';
 
 const DEFAULT_APP_NAME = Platform.OS === 'ios' ? '__FIRAPP_DEFAULT' : '[DEFAULT]';
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
