Address PR comments

Author: hsubox76

packages-exp/app-check-compat/package.json

@@ -22,10 +22,9 @@
     "test:browser": "karma start --single-run --nocache"
   },
   "peerDependencies": {
-    "@firebase/app-exp": "0.x"
+    "@firebase/app-compat": "0.x"
   },
   "dependencies": {
-    "@firebase/app-compat": "0.0.900",
     "@firebase/app-check-exp": "0.0.900",
     "@firebase/logger": "0.2.6",
     "@firebase/util": "1.1.0",
@@ -34,7 +33,6 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-exp": "0.0.900",
     "rollup": "2.33.2",
     "@rollup/plugin-commonjs": "17.1.0",
     "@rollup/plugin-json": "4.1.0",

packages-exp/app-check-compat/rollup.config.release.js

@@ -36,10 +36,7 @@ const es5BuildPlugins = [
 
 const es5Builds = es5BuildsNoPlugin.map(build => ({
   ...build,
-  plugins: es5BuildPlugins,
-  treeshake: {
-    moduleSideEffects: id => id === '@firebase/installations'
-  }
+  plugins: es5BuildPlugins
 }));
 
 /**

packages-exp/app-check-compat/src/index.ts

@@ -31,29 +31,25 @@ import { FirebaseAppCheck } from '../../../packages/app-check-types';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {
-    'app-check-compat': AppCheckService;
+    'appCheck-compat': AppCheckService;
   }
 }
 
-const factory: InstanceFactory<'app-check-compat'> = (
+const factory: InstanceFactory<'appCheck-compat'> = (
   container: ComponentContainer
 ) => {
   // Dependencies
   const app = container.getProvider('app-compat').getImmediate();
-  const AppCheckServiceExp = container
+  const appCheckServiceExp = container
     .getProvider('app-check-exp')
     .getImmediate();
 
-  return new AppCheckService(app as FirebaseApp, AppCheckServiceExp);
+  return new AppCheckService(app as FirebaseApp, appCheckServiceExp);
 };
 
 export function registerAppCheck(): void {
   (firebase as _FirebaseNamespace).INTERNAL.registerComponent(
-    new Component(
-      'app-check-compat',
-      factory,
-      ComponentType.PUBLIC
-    ).setMultipleInstances(true)
+    new Component('appCheck-compat', factory, ComponentType.PUBLIC)
   );
 }
 

packages-exp/app-check-compat/src/service.test.ts

@@ -21,10 +21,7 @@ import * as appCheckExp from '@firebase/app-check-exp';
 import { stub, match, SinonStub } from 'sinon';
 import * as sinonChai from 'sinon-chai';
 import { CustomProvider, ReCaptchaV3Provider } from '@firebase/app-check-exp';
-import {
-  AppCheckToken,
-  AppCheckTokenResult
-} from '../../../packages/app-check-types';
+import { AppCheckTokenResult } from '../../../packages/app-check-types';
 import { PartialObserver } from '../../../packages/util/dist';
 
 use(sinonChai);
@@ -38,7 +35,7 @@ function createTestService(app: FirebaseApp): AppCheckService {
   );
 }
 
-describe('Firebase Analytics > Service', () => {
+describe('Firebase App Check > Service', () => {
   let app: FirebaseApp;
   let service: AppCheckService;
 
@@ -76,11 +73,19 @@ describe('Firebase Analytics > Service', () => {
     () => {
       const initializeAppCheckStub = stub(appCheckExp, 'initializeAppCheck');
       service = new AppCheckService(app, {} as appCheckExp.AppCheck);
+      const customGetTokenStub = stub();
       service.activate({
-        getToken: () => Promise.resolve({} as AppCheckToken)
+        getToken: customGetTokenStub
       });
       expect(initializeAppCheckStub).to.be.calledWith(app, {
-        provider: match.instanceOf(CustomProvider),
+        provider: match
+          .instanceOf(CustomProvider)
+          .and(
+            match.hasNested(
+              '_customProviderOptions.getToken',
+              customGetTokenStub
+            )
+          ),
         isTokenAutoRefreshEnabled: undefined
       });
       initializeAppCheckStub.restore();