update app dependency

Author: zwu52

packages-exp/messaging-exp/package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@firebase/component": "0.1.19",
-    "@firebase/installations-exp": "0.0.800",
+    "@firebase/installations": "0.4.17",
     "@firebase/messaging-types-exp": "0.0.800",
     "@firebase/util": "0.3.2",
     "eslint": "^7.3.1",

packages-exp/messaging-exp/src/api.ts

@@ -69,7 +69,7 @@ export class MessagingService implements _FirebaseService {
   readonly swController: SwController | null = null;
 
   constructor(container: ComponentContainer) {
-    const app = container.getProvider('app').getImmediate();
+    const app = container.getProvider('app-exp').getImmediate();
     const appConfig = extractAppConfig(app);
     const installations = container.getProvider('installations').getImmediate();
     const analyticsProvider = container.getProvider('analytics-internal');

packages-exp/messaging-exp/src/helpers/extract-app-config.test.ts

@@ -42,14 +42,12 @@ describe('extractAppConfig', () => {
     ).to.throw('Missing App configuration value: "App Configuration Object"');
 
     let firebaseApp = getFakeApp();
-    // @ts-expect-error
     delete firebaseApp.options;
     expect(() => extractAppConfig(firebaseApp)).to.throw(
       'Missing App configuration value: "App Configuration Object"'
     );
 
     firebaseApp = getFakeApp();
-    // @ts-expect-error
     delete firebaseApp.name;
     expect(() => extractAppConfig(firebaseApp)).to.throw(
       'Missing App configuration value: "App Name"'

packages-exp/messaging-exp/src/index.ts

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-import '@firebase/installations-exp';
-
 import {
   Component,
   ComponentContainer,

packages-exp/messaging-exp/src/interfaces/internal-dependencies.ts

@@ -18,7 +18,7 @@
 import { AppConfig } from './app-config';
 import { FirebaseAnalyticsInternalName } from '@firebase/analytics-interop-types';
 import { FirebaseApp } from '@firebase/app-types-exp';
-import { FirebaseInstallations } from '@firebase/installations-types-exp';
+import { FirebaseInstallations } from '@firebase/installations-types';
 import { Provider } from '@firebase/component';
 
 export interface FirebaseInternalDependencies {

packages-exp/messaging-exp/src/testing/fakes/firebase-dependencies.ts

@@ -21,7 +21,7 @@ import {
 } from '@firebase/analytics-interop-types';
 import { FirebaseApp, FirebaseOptions } from '@firebase/app-types-exp';
 
-import { FirebaseInstallations } from '@firebase/installations-types-exp';
+import { FirebaseInstallations } from '@firebase/installations-types';
 import { FirebaseInternalDependencies } from '../../interfaces/internal-dependencies';
 import { Provider } from '@firebase/component';
 import { extractAppConfig } from '../../helpers/extract-app-config';
@@ -38,7 +38,7 @@ export function getFakeFirebaseDependencies(
   };
 }
 
-export function getFakeApp(options: FirebaseOptions = {}): FirebaseApp {
+export function getFakeApp(options: FirebaseOptions = {}): any {
   options = {
     apiKey: 'apiKey',
     projectId: 'projectId',
@@ -54,8 +54,8 @@ export function getFakeApp(options: FirebaseOptions = {}): FirebaseApp {
     options,
     automaticDataCollectionEnabled: true,
     delete: async () => {},
-    messaging: (() => null as unknown) as FirebaseApp['messaging']
-    // installations: () => getFakeInstallations()
+    messaging: (() => null as unknown) as FirebaseApp['messaging'],
+    installations: () => getFakeInstallations()
   };
 }