Fix(issue 3075): bundle includes optional app check (#3413)

* fix: Bundle includes optional `app-check`

moving the `AppCheckInstances` to core file, so when other modules uses it, it doesn't load the whole package with it

Fix #3075

* fix: make `AppCheckInstances` exported only from `@angular/fire/app-check`

Fix #3075

---------

Co-authored-by: David East <[email protected]>

Author: robertIsaac

src/app-check/app-check.module.ts

@@ -1,16 +1,15 @@
 import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders, PLATFORM_ID, isDevMode, Injector } from '@angular/core';
 import { AppCheck as FirebaseAppCheck } from 'firebase/app-check';
-import { ɵgetDefaultInstanceOf, ɵAngularFireSchedulers, VERSION } from '@angular/fire';
-import { AppCheck, AppCheckInstances, APP_CHECK_PROVIDER_NAME } from './app-check';
+import { ɵgetDefaultInstanceOf, ɵAngularFireSchedulers, ɵAppCheckInstances, ɵAPP_CHECK_PROVIDER_NAME, VERSION } from '@angular/fire';
+import { AppCheck } from './app-check';
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
 import { registerVersion } from 'firebase/app';
 import { isPlatformServer } from '@angular/common';
 
 export const PROVIDED_APP_CHECK_INSTANCES = new InjectionToken<AppCheck[]>('angularfire2.app-check-instances');
-export const APP_CHECK_NAMESPACE_SYMBOL = Symbol('angularfire2.app-check.namespace');
 
 export function defaultAppCheckInstanceFactory(provided: FirebaseAppCheck[]|undefined, defaultApp: FirebaseApp) {
-  const defaultAppCheck = ɵgetDefaultInstanceOf<FirebaseAppCheck>(APP_CHECK_PROVIDER_NAME, provided, defaultApp);
+  const defaultAppCheck = ɵgetDefaultInstanceOf<FirebaseAppCheck>(ɵAPP_CHECK_PROVIDER_NAME, provided, defaultApp);
   return defaultAppCheck && new AppCheck(defaultAppCheck);
 }
 
@@ -30,7 +29,7 @@ export function appCheckInstanceFactory(fn: (injector: Injector) => FirebaseAppC
 }
 
 const APP_CHECK_INSTANCES_PROVIDER = {
-  provide: AppCheckInstances,
+  provide: ɵAppCheckInstances,
   deps: [
     [new Optional(), PROVIDED_APP_CHECK_INSTANCES ],
   ]

src/app-check/app-check.ts

@@ -1,10 +1,8 @@
 import { AppCheck as FirebaseAppCheck } from 'firebase/app-check';
-import { ɵgetAllInstancesOf } from '@angular/fire';
+import { ɵgetAllInstancesOf, ɵAPP_CHECK_PROVIDER_NAME } from '@angular/fire';
 import { from, timer } from 'rxjs';
 import { concatMap, distinct } from 'rxjs/operators';
 
-export const APP_CHECK_PROVIDER_NAME = 'app-check';
-
 // see notes in core/firebase.app.module.ts for why we're building the class like this
 // tslint:disable-next-line:no-empty-interface
 export interface AppCheck extends FirebaseAppCheck {}
@@ -15,16 +13,7 @@ export class AppCheck {
   }
 }
 
-// tslint:disable-next-line:no-empty-interface
-export interface AppCheckInstances extends Array<FirebaseAppCheck> {}
-
-export class AppCheckInstances {
-  constructor() {
-    return ɵgetAllInstancesOf<FirebaseAppCheck>(APP_CHECK_PROVIDER_NAME);
-  }
-}
-
 export const appCheckInstance$ = timer(0, 300).pipe(
-  concatMap(() => from(ɵgetAllInstancesOf<FirebaseAppCheck>(APP_CHECK_PROVIDER_NAME))),
+  concatMap(() => from(ɵgetAllInstancesOf<FirebaseAppCheck>(ɵAPP_CHECK_PROVIDER_NAME))),
   distinct(),
 );

src/app-check/public_api.ts

@@ -1,3 +1,4 @@
-export { AppCheck, AppCheckInstances, appCheckInstance$ } from './app-check';
+export { AppCheck, appCheckInstance$ } from './app-check';
+export { ɵAppCheckInstances as AppCheckInstances } from '@angular/fire';
 export { provideAppCheck, AppCheckModule } from './app-check.module';
 export * from './firebase';

src/auth/auth.module.ts

@@ -4,7 +4,7 @@ import { ɵgetDefaultInstanceOf, ɵAngularFireSchedulers, VERSION } from '@angul
 import { Auth, AuthInstances, AUTH_PROVIDER_NAME } from './auth';
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
 import { registerVersion } from 'firebase/app';
-import { AppCheckInstances } from '@angular/fire/app-check';
+import { ɵAppCheckInstances } from '@angular/fire';
 
 export const PROVIDED_AUTH_INSTANCES = new InjectionToken<Auth[]>('angularfire2.auth-instances');
 
@@ -60,7 +60,7 @@ export function provideAuth(fn: (injector: Injector) => FirebaseAuth, ...deps: a
         Injector,
         ɵAngularFireSchedulers,
         FirebaseApps,
-        [new Optional(), AppCheckInstances ],
+        [new Optional(), ɵAppCheckInstances ],
         ...deps,
       ]
     }]

src/core.ts

@@ -1,6 +1,7 @@
 import { Version } from '@angular/core';
 import { FirebaseApp, getApps } from 'firebase/app';
 import { ComponentContainer } from '@firebase/component';
+import type { AppCheck } from 'firebase/app-check';
 
 export const VERSION = new Version('ANGULARFIRE2_VERSION');
 
@@ -41,3 +42,16 @@ export const ɵgetAllInstancesOf = <T= unknown>(identifier: string, app?: Fireba
   });
   return instances;
 };
+
+// tslint:disable-next-line:no-empty-interface class-name
+export interface ɵAppCheckInstances extends Array<AppCheck> {}
+
+// tslint:disable-next-line:class-name
+export class ɵAppCheckInstances {
+  constructor() {
+    return ɵgetAllInstancesOf<AppCheck>(ɵAPP_CHECK_PROVIDER_NAME);
+  }
+}
+
+// tslint:disable-next-line:variable-name
+export const ɵAPP_CHECK_PROVIDER_NAME = 'app-check';

src/database/database.module.ts

@@ -5,7 +5,7 @@ import { ɵgetDefaultInstanceOf, ɵAngularFireSchedulers, VERSION } from '@angul
 import { Database, DatabaseInstances, DATABASE_PROVIDER_NAME } from './database';
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
 import { registerVersion } from 'firebase/app';
-import { AppCheckInstances } from '@angular/fire/app-check';
+import { ɵAppCheckInstances } from '@angular/fire';
 
 export const PROVIDED_DATABASE_INSTANCES = new InjectionToken<Database[]>('angularfire2.database-instances');
 
@@ -63,7 +63,7 @@ export function provideDatabase(fn: (injector: Injector) => FirebaseDatabase, ..
         FirebaseApps,
         // Database+Auth work better if Auth is loaded first
         [new Optional(), AuthInstances ],
-        [new Optional(), AppCheckInstances ],
+        [new Optional(), ɵAppCheckInstances ],
         ...deps,
       ]
     }]

src/firestore/firestore.module.ts

@@ -5,7 +5,7 @@ import { ɵgetDefaultInstanceOf, ɵAngularFireSchedulers, VERSION } from '@angul
 import { Firestore, FirestoreInstances, FIRESTORE_PROVIDER_NAME } from './firestore';
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
 import { registerVersion } from 'firebase/app';
-import { AppCheckInstances } from '@angular/fire/app-check';
+import { ɵAppCheckInstances } from '@angular/fire';
 
 export const PROVIDED_FIRESTORE_INSTANCES = new InjectionToken<Firestore[]>('angularfire2.firestore-instances');
 
@@ -63,7 +63,7 @@ export function provideFirestore(fn: (injector: Injector) => FirebaseFirestore,
         FirebaseApps,
         // Firestore+Auth work better if Auth is loaded first
         [new Optional(), AuthInstances ],
-        [new Optional(), AppCheckInstances ],
+        [new Optional(), ɵAppCheckInstances ],
         ...deps,
       ]
     }]

src/firestore/lite/lite.module.ts

@@ -1,11 +1,10 @@
 import { NgModule, Optional, NgZone, InjectionToken, ModuleWithProviders, Injector } from '@angular/core';
 import { Firestore as FirebaseFirestore } from 'firebase/firestore/lite';
 import { AuthInstances  } from '@angular/fire/auth';
-import { ɵgetDefaultInstanceOf, ɵAngularFireSchedulers, VERSION } from '@angular/fire';
+import { ɵgetDefaultInstanceOf, ɵAngularFireSchedulers, ɵAppCheckInstances, VERSION } from '@angular/fire';
 import { Firestore, FirestoreInstances, FIRESTORE_PROVIDER_NAME } from './lite';
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
 import { registerVersion } from 'firebase/app';
-import { AppCheckInstances } from '@angular/fire/app-check';
 
 export const PROVIDED_FIRESTORE_INSTANCES = new InjectionToken<Firestore[]>('angularfire2.firestore-lite-instances');
 
@@ -63,7 +62,7 @@ export function provideFirestore(fn: (injector: Injector) => FirebaseFirestore,
         FirebaseApps,
         // Firestore+Auth work better if Auth is loaded first
         [new Optional(), AuthInstances ],
-        [new Optional(), AppCheckInstances ],
+        [new Optional(), ɵAppCheckInstances ],
         ...deps,
       ]
     }]

src/functions/functions.module.ts

@@ -5,7 +5,7 @@ import { Functions, FunctionsInstances, FUNCTIONS_PROVIDER_NAME } from './functi
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
 import { AuthInstances } from '@angular/fire/auth';
 import { registerVersion } from 'firebase/app';
-import { AppCheckInstances } from '@angular/fire/app-check';
+import { ɵAppCheckInstances } from '@angular/fire';
 
 export const PROVIDED_FUNCTIONS_INSTANCES = new InjectionToken<Functions[]>('angularfire2.functions-instances');
 
@@ -63,7 +63,7 @@ export function provideFunctions(fn: (injector: Injector) => FirebaseFunctions,
         FirebaseApps,
         // Defensively load Auth first, if provided
         [new Optional(), AuthInstances ],
-        [new Optional(), AppCheckInstances ],
+        [new Optional(), ɵAppCheckInstances ],
         ...deps,
       ]
     }]

src/storage/storage.module.ts

@@ -5,7 +5,7 @@ import { Storage, StorageInstances, STORAGE_PROVIDER_NAME } from './storage';
 import { FirebaseApps, FirebaseApp } from '@angular/fire/app';
 import { AuthInstances } from '@angular/fire/auth';
 import { registerVersion } from 'firebase/app';
-import { AppCheckInstances } from '@angular/fire/app-check';
+import { ɵAppCheckInstances } from '@angular/fire';
 
 export const PROVIDED_STORAGE_INSTANCES = new InjectionToken<Storage[]>('angularfire2.storage-instances');
 
@@ -63,7 +63,7 @@ export function provideStorage(fn: (injector: Injector) => FirebaseStorage, ...d
         FirebaseApps,
         // Defensively load Auth first, if provided
         [new Optional(), AuthInstances ],
-        [new Optional(), AppCheckInstances ],
+        [new Optional(), ɵAppCheckInstances ],
         ...deps,
       ]
     }]