Make options to factory optional.

firebase · Mar 15, 2021 · fa26bb1 · fa26bb1
1 parent 0453815
commit fa26bb1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/packages-exp/functions-compat/src/register.ts b/packages-exp/functions-compat/src/register.ts
@@ -39,14 +39,15 @@ declare module '@firebase/component' {
 
 const factory: InstanceFactory<'functions-compat'> = (
   container: ComponentContainer,
-  { instanceIdentifier: regionOrCustomDomain }: InstanceFactoryOptions
+  options?: InstanceFactoryOptions
 ) => {
   // Dependencies
   const app = container.getProvider('app-compat').getImmediate();
   const functionsServiceExp = container
     .getProvider('functions-exp')
     .getImmediate({
-      identifier: regionOrCustomDomain
+      // This value is used as regionOrCustomDomain
+      identifier: options?.instanceIdentifier
     });
 
   return new FunctionsService(app, functionsServiceExp);

diff --git a/packages-exp/functions-exp/src/config.ts b/packages-exp/functions-exp/src/config.ts
@@ -21,7 +21,8 @@ import {
   Component,
   ComponentType,
   ComponentContainer,
-  InstanceFactory
+  InstanceFactory,
+  InstanceFactoryOptions
 } from '@firebase/component';
 import { FUNCTIONS_TYPE } from './constants';
 
@@ -30,7 +31,7 @@ export const DEFAULT_REGION = 'us-central1';
 export function registerFunctions(fetchImpl: typeof fetch): void {
   const factory: InstanceFactory<'functions'> = (
     container: ComponentContainer,
-    { instanceIdentifier: regionOrCustomDomain }
+    options?: InstanceFactoryOptions
   ) => {
     // Dependencies
     const app = container.getProvider('app-exp').getImmediate();
@@ -42,7 +43,8 @@ export function registerFunctions(fetchImpl: typeof fetch): void {
       app,
       authProvider,
       messagingProvider,
-      regionOrCustomDomain,
+      // regionOrCustomDomain
+      options?.instanceIdentifier,
       fetchImpl
     );
   };

diff --git a/packages/functions/src/config.ts b/packages/functions/src/config.ts
@@ -40,7 +40,7 @@ export function registerFunctions(
 
   function factory(
     container: ComponentContainer,
-    { instanceIdentifier: regionOrCustomDomain }: InstanceFactoryOptions
+    options?: InstanceFactoryOptions
   ): Service {
     // Dependencies
     const app = container.getProvider('app').getImmediate();
@@ -52,7 +52,8 @@ export function registerFunctions(
       app,
       authProvider,
       messagingProvider,
-      regionOrCustomDomain,
+      // regionOrCustomDomain
+      options?.instanceIdentifier,
       fetchImpl
     );
   }