Remove @firebase/messaging-types

Moves messaging types to an interface within the messaging package.

Closes #526.

Author: mmermerkaya

.github/CODEOWNERS

@@ -20,7 +20,6 @@ packages/storage-types  @sphippen
 
 # Messaging Code
 packages/messaging  @gauntface @pinarx @mmermerkaya @alecmce @dwoffinden
-packages/messaging-types  @gauntface @pinarx @mmermerkaya @alecmce @dwoffinden
 integration/messaging  @gauntface @pinarx @mmermerkaya @alecmce @dwoffinden
 
 # Auth Code

packages/functions/package.json

@@ -64,7 +64,6 @@
   "typings": "dist/index.d.ts",
   "dependencies": {
     "@firebase/functions-types": "0.1.2",
-    "@firebase/messaging-types": "0.2.2",
     "isomorphic-fetch": "2.2.1"
   },
   "nyc": {

packages/functions/src/context.ts

@@ -16,7 +16,7 @@
 import { FirebaseApp } from '@firebase/app-types';
 import { _FirebaseApp } from '@firebase/app-types/private';
 import { firebase } from '@firebase/app';
-import { FirebaseMessaging } from '@firebase/messaging-types';
+import { FirebaseMessaging } from '@firebase/messaging';
 
 /**
  * The metadata that should be supplied with function calls.

packages/messaging-types/package.json

@@ -19,12 +19,14 @@ import {
   _FirebaseNamespace,
   FirebaseServiceFactory
 } from '@firebase/app-types/private';
-import { FirebaseMessaging } from '@firebase/messaging-types';
 
 import { SwController } from './src/controllers/sw-controller';
 import { WindowController } from './src/controllers/window-controller';
+import { FirebaseMessaging } from './src/interfaces/firebase-messaging';
 import { ERROR_CODES, errorFactory } from './src/models/errors';
 
+export { FirebaseMessaging } from './src/interfaces/firebase-messaging';
+
 export function registerMessaging(instance: _FirebaseNamespace): void {
   const messagingName = 'messaging';
 

packages/messaging-types/tsconfig.json

@@ -25,7 +25,6 @@
     "@firebase/app-types": "0.x"
   },
   "dependencies": {
-    "@firebase/messaging-types": "0.2.2",
     "@firebase/util": "0.2.0",
     "tslib": "1.9.0"
   },

packages/messaging/index.ts

@@ -16,7 +16,6 @@
 
 import { FirebaseApp } from '@firebase/app-types';
 import { FirebaseServiceInternals } from '@firebase/app-types/private';
-import { FirebaseMessaging } from '@firebase/messaging-types';
 import {
   CompleteFn,
   ErrorFn,
@@ -26,6 +25,7 @@ import {
 } from '@firebase/util';
 
 import { isArrayBufferEqual } from '../helpers/is-array-buffer-equal';
+import { FirebaseMessaging } from '../interfaces/firebase-messaging';
 import { MessagePayload } from '../interfaces/message-payload';
 import { TokenDetails } from '../interfaces/token-details';
 import { ERROR_CODES, errorFactory } from '../models/errors';

packages/messaging/package.json

@@ -14,31 +14,32 @@
  * limitations under the License.
  */
 
-import { FirebaseApp, FirebaseNamespace } from '@firebase/app-types';
 import {
-  Observer,
-  Unsubscribe,
-  NextFn,
+  CompleteFn,
   ErrorFn,
-  CompleteFn
+  NextFn,
+  Observer,
+  Unsubscribe
 } from '@firebase/util';
 
-export class FirebaseMessaging {
-  private constructor();
+export interface FirebaseMessaging {
   deleteToken(token: string): Promise<boolean>;
   getToken(): Promise<string | null>;
   onMessage(
+    // tslint:disable-next-line no-any The message payload can be anything.
     nextOrObserver: NextFn<any> | Observer<any>,
     error?: ErrorFn,
     completed?: CompleteFn
   ): Unsubscribe;
   onTokenRefresh(
+    // tslint:disable-next-line no-any Not implemented yet.
     nextOrObserver: NextFn<any> | Observer<any>,
     error?: ErrorFn,
     completed?: CompleteFn
   ): Unsubscribe;
   requestPermission(): Promise<void>;
   setBackgroundMessageHandler(
+    // tslint:disable no-any The message payload can be anything.
     callback: (payload: any) => Promise<any> | void
   ): void;
   useServiceWorker(registration: ServiceWorkerRegistration): void;