Updating the dependencies for performance-exp to use the exp packages for for Firebase deps

Author: jposuna

packages-exp/performance-exp/index.ts

@@ -15,69 +15,59 @@
  * limitations under the License.
  */
 
-import firebase from '@firebase/app';
-import '@firebase/installations';
-import { FirebaseApp, FirebaseNamespace } from '@firebase/app-types';
-import { _FirebaseNamespace } from '@firebase/app-types/private';
-import { PerformanceController } from './src/controllers/perf';
+import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebasePerformance } from '@firebase/performance-types-exp';
+import { ERROR_FACTORY, ErrorCode } from './src/utils/errors';
 import { setupApi } from './src/services/api_service';
+import { PerformanceController } from './src/controllers/perf';
+import {
+  _registerComponent,
+  _getProvider,
+  registerVersion
+} from '@firebase/app-exp';
+import {
+  InstanceFactory,
+  ComponentContainer,
+  Component,
+  ComponentType
+} from '@firebase/component';
 import { SettingsService } from './src/services/settings_service';
-import { ERROR_FACTORY, ErrorCode } from './src/utils/errors';
-import { FirebasePerformance } from '@firebase/performance-types';
-import { Component, ComponentType } from '@firebase/component';
-import { FirebaseInstallations } from '@firebase/installations-types';
 import { name, version } from './package.json';
 
 const DEFAULT_ENTRY_NAME = '[DEFAULT]';
 
-export function registerPerformance(instance: FirebaseNamespace): void {
-  const factoryMethod = (
-    app: FirebaseApp,
-    installations: FirebaseInstallations
-  ): PerformanceController => {
-    if (app.name !== DEFAULT_ENTRY_NAME) {
-      throw ERROR_FACTORY.create(ErrorCode.FB_NOT_DEFAULT);
-    }
-    if (typeof window === 'undefined') {
-      throw ERROR_FACTORY.create(ErrorCode.NO_WINDOW);
-    }
-    setupApi(window);
-    SettingsService.getInstance().firebaseAppInstance = app;
-    SettingsService.getInstance().installationsService = installations;
-    return new PerformanceController(app);
-  };
-
-  // Register performance with firebase-app.
-  (instance as _FirebaseNamespace).INTERNAL.registerComponent(
-    new Component(
-      'performance',
-      container => {
-        /* Dependencies */
-        // getImmediate for FirebaseApp will always succeed
-        const app = container.getProvider('app').getImmediate();
-        // The following call will always succeed because perf has `import '@firebase/installations'`
-        const installations = container
-          .getProvider('installations')
-          .getImmediate();
-
-        return factoryMethod(app, installations);
-      },
-      ComponentType.PUBLIC
-    )
-  );
-
-  instance.registerVersion(name, version);
+export function getPerformance(app: FirebaseApp): FirebasePerformance {
+  const provider = _getProvider(app, 'performance-exp');
+  const perfInstance = provider.getImmediate() as PerformanceController;
+  return perfInstance;
 }
 
-registerPerformance(firebase);
+const factory: InstanceFactory<'performance-exp'> = (
+  container: ComponentContainer
+) => {
+  // Dependencies
+  const app = container.getProvider('app-exp').getImmediate();
+  const installations = container
+    .getProvider('installations-exp-internal')
+    .getImmediate();
 
-declare module '@firebase/app-types' {
-  interface FirebaseNamespace {
-    performance?: {
-      (app?: FirebaseApp): FirebasePerformance;
-    };
+  if (app.name !== DEFAULT_ENTRY_NAME) {
+    throw ERROR_FACTORY.create(ErrorCode.FB_NOT_DEFAULT);
   }
-  interface FirebaseApp {
-    performance?(): FirebasePerformance;
+  if (typeof window === 'undefined') {
+    throw ERROR_FACTORY.create(ErrorCode.NO_WINDOW);
   }
+  setupApi(window);
+  SettingsService.getInstance().firebaseAppInstance = app;
+  SettingsService.getInstance().installationsService = installations;
+  return new PerformanceController(app);
+};
+
+export function registerPerformance(): void {
+  _registerComponent(
+    new Component('performance-exp', factory, ComponentType.PUBLIC)
+  );
 }
+
+registerPerformance();
+registerVersion(name, version);

packages-exp/performance-exp/package.json

@@ -22,20 +22,20 @@
     "prettier": "prettier --write '{src,test}/**/*.{js,ts}'"
   },
   "peerDependencies": {
-    "@firebase/app": "0.x",
-    "@firebase/app-types": "0.x"
+    "@firebase/app-exp": "0.x",
+    "@firebase/app-types-exp": "0.x"
   },
   "dependencies": {
     "@firebase/logger": "0.2.6",
-    "@firebase/installations": "0.4.17",
+    "@firebase/installations-exp": "0.0.800",
     "@firebase/util": "0.3.2",
     "@firebase/performance-types-exp": "0.0.800",
     "@firebase/component": "0.1.19",
     "tslib": "^1.11.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.6.11",
+    "@firebase/app-exp": "0.0.800",
     "rollup": "2.26.7",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-typescript2": "0.27.2",

packages-exp/performance-exp/src/controllers/perf.test.ts

@@ -20,7 +20,7 @@ import { stub } from 'sinon';
 import { PerformanceController } from '../controllers/perf';
 import { Trace } from '../resources/trace';
 import { Api, setupApi } from '../services/api_service';
-import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseApp } from '@firebase/app-types-exp';
 import * as initializationService from '../services/initialization_service';
 import * as FirebaseUtil from '@firebase/util';
 import { consoleLogger } from '../utils/console_logger';

packages-exp/performance-exp/src/controllers/perf.ts

@@ -19,11 +19,12 @@ import { setupOobResources } from '../services/oob_resources_service';
 import { SettingsService } from '../services/settings_service';
 import { getInitializationPromise } from '../services/initialization_service';
 import { Api } from '../services/api_service';
-import { FirebaseApp } from '@firebase/app-types';
-import { FirebasePerformance } from '@firebase/performance-types';
+import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebasePerformance } from '@firebase/performance-types-exp';
 import { setupTransportService } from '../services/transport_service';
 import { validateIndexedDBOpenable } from '@firebase/util';
 import { consoleLogger } from '../utils/console_logger';
+
 export class PerformanceController implements FirebasePerformance {
   constructor(readonly app: FirebaseApp) {
     if (Api.getInstance().requiredApisAvailable()) {

packages-exp/performance-exp/src/resources/trace.ts

@@ -35,7 +35,7 @@ import {
   isValidMetricName,
   convertMetricValueToInteger
 } from '../utils/metric_utils';
-import { PerformanceTrace } from '@firebase/performance-types';
+import { PerformanceTrace } from '@firebase/performance-types-exp';
 
 const enum TraceState {
   UNINITIALIZED = 1,

packages-exp/performance-exp/src/services/iid_service.test.ts

@@ -25,7 +25,7 @@ import {
   getAuthTokenPromise
 } from './iid_service';
 import '../../test/setup';
-import { FirebaseInstallations } from '@firebase/installations-types';
+import { _FirebaseInstallationsInternal } from '@firebase/installations-types-exp';
 
 describe('Firebase Perofmrance > iid_service', () => {
   const IID = 'fid';
@@ -37,7 +37,7 @@ describe('Firebase Perofmrance > iid_service', () => {
     SettingsService.prototype.installationsService = ({
       getId,
       getToken
-    } as unknown) as FirebaseInstallations;
+    } as unknown) as _FirebaseInstallationsInternal;
   });
 
   describe('getIidPromise', () => {

packages-exp/performance-exp/src/services/initialization_service.test.ts

@@ -23,7 +23,7 @@ import {
 } from './initialization_service';
 import { setupApi } from './api_service';
 import { SettingsService } from './settings_service';
-import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseApp } from '@firebase/app-types-exp';
 import '../../test/setup';
 
 describe('Firebase Perofmrance > initialization_service', () => {

packages-exp/performance-exp/src/services/perf_logger.test.ts

@@ -22,7 +22,7 @@ import * as iidService from './iid_service';
 import { expect } from 'chai';
 import { Api, setupApi } from './api_service';
 import { SettingsService } from './settings_service';
-import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseApp } from '@firebase/app-types-exp';
 import * as initializationService from './initialization_service';
 import { SDK_VERSION } from '../constants';
 import * as attributeUtils from '../utils/attributes_utils';

packages-exp/performance-exp/src/services/remote_config_service.test.ts

@@ -21,7 +21,7 @@ import { CONFIG_EXPIRY_LOCAL_STORAGE_KEY } from '../constants';
 import { setupApi, Api } from './api_service';
 import * as iidService from './iid_service';
 import { getConfig } from './remote_config_service';
-import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseApp } from '@firebase/app-types-exp';
 import '../../test/setup';
 
 describe('Performance Monitoring > remote_config_service', () => {

packages-exp/performance-exp/src/services/settings_service.ts

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import { FirebaseApp } from '@firebase/app-types';
+import { FirebaseApp } from '@firebase/app-types-exp';
 import { ERROR_FACTORY, ErrorCode } from '../utils/errors';
-import { FirebaseInstallations } from '@firebase/installations-types';
+import { _FirebaseInstallationsInternal } from '@firebase/installations-types-exp';
 import { mergeStrings } from '../utils/string_merger';
 
 let settingsServiceInstance: SettingsService | undefined;
@@ -59,7 +59,7 @@ export class SettingsService {
 
   firebaseAppInstance!: FirebaseApp;
 
-  installationsService!: FirebaseInstallations;
+  installationsService!: _FirebaseInstallationsInternal;
 
   getAppId(): string {
     const appId =

packages-exp/performance-types-exp/index.d.ts

@@ -114,6 +114,6 @@ export interface PerformanceTrace {
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
-    'performance': FirebasePerformance;
+    'performance-exp': FirebasePerformance;
   }
 }